[cfe-commits] r145700 - in /cfe/trunk: lib/Sema/SemaLookup.cpp test/Modules/Inputs/module.map

[Douglas Gregor]

Author: dgregor
Date: Fri Dec  2 14:08:44 2011
New Revision: 145700

URL: http://llvm.org/viewvc/llvm-project?rev=145700&view=rev
Log:
Make sure that name lookup in C checks whether a name is hidden.

Modified:
    cfe/trunk/lib/Sema/SemaLookup.cpp
    cfe/trunk/test/Modules/Inputs/module.map

Modified: cfe/trunk/lib/Sema/SemaLookup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaLookup.cpp?rev=145700&r1=145699&r2=145700&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaLookup.cpp (original)
+++ cfe/trunk/lib/Sema/SemaLookup.cpp Fri Dec  2 14:08:44 2011
@@ -1123,6 +1123,11 @@
                  !isa<ImplicitParamDecl>(*I))
           continue;
         
+        // If this declaration is module-private and it came from an AST
+        // file, we can't see it.
+        if ((*I)->isModulePrivate() && (*I)->isFromASTFile())
+          continue;
+            
         R.addDecl(*I);
 
         if ((*I)->getAttr<OverloadableAttr>()) {

Modified: cfe/trunk/test/Modules/Inputs/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/module.map?rev=145700&r1=145699&r2=145700&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/module.map (original)
+++ cfe/trunk/test/Modules/Inputs/module.map Fri Dec  2 14:08:44 2011
@@ -21,9 +21,19 @@
 module module_private_right { header "module_private_right.h" }
 module macros { header "macros.h" }
 module category_top { header "category_top.h" }
-module category_left { header "category_left.h" }
-module category_right { header "category_right.h" }
-module category_bottom { header "category_bottom.h" }
+module category_left { 
+  header "category_left.h" 
+  export category_top
+}
+module category_right { 
+  header "category_right.h" 
+  export category_top
+}
+module category_bottom { 
+  header "category_bottom.h" 
+  export category_left
+  export category_right
+}
 module redeclarations_left { header "redeclarations_left.h" }
 module redeclarations_right { header "redeclarations_right.h" }
 module load_failure { header "load_failure.h" }