From: Ben Langmuir <blangmuir@apple.com>
Date: Mon, 14 Jul 2014 19:45:12 +0000 (+0000)
Subject: Fix case-sensitivity of inferred framework modules
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b7f73451f7e83ff3c9e175ab47af444486fd2d7;p=platform%2Fupstream%2Fllvm.git

Fix case-sensitivity of inferred framework modules

Just because we can open a directory named "COcoa.framework" doesn't
mean we should provide a "COcoa" module on a case-insensitive filesystem.

llvm-svn: 212975
---

diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index a6d1d82..8fae9c9 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -624,6 +624,12 @@ ModuleMap::inferFrameworkModule(StringRef ModuleName,
     StringRef FrameworkDirName
       = SourceMgr.getFileManager().getCanonicalName(FrameworkDir);
 
+    // In case this is a case-insensitive filesystem, make sure the canonical
+    // directory name matches ModuleName exactly. Modules are case-sensitive.
+    // FIXME: we should be able to give a fix-it hint for the correct spelling.
+    if (llvm::sys::path::stem(FrameworkDirName) != ModuleName)
+      return nullptr;
+
     bool canInfer = false;
     if (llvm::sys::path::has_parent_path(FrameworkDirName)) {
       // Figure out the parent path.
diff --git a/clang/test/Modules/inferred-framework-case.m b/clang/test/Modules/inferred-framework-case.m
new file mode 100644
index 0000000..0443bed
--- /dev/null
+++ b/clang/test/Modules/inferred-framework-case.m
@@ -0,0 +1,5 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -F %S/Inputs %s -verify -DA
+
+@import MOdule; // expected-error{{module 'MOdule' not found}}
+@import Module;