commit 71eafded8950b40f1c0a617b74724450d9cabc71
author Vassil Vassilev <v.g.vassilev@gmail.com> Wed Apr 06 20:56:03 2016 +0000
committer Vassil Vassilev <v.g.vassilev@gmail.com> Wed Apr 06 20:56:03 2016 +0000
tree 0b30e83c1bc95623e37f2401a4d8cddd9ae41c74
parent 1951cf24a789119d500f1e5f042b309cb70c3958

[modules] Don't try to add lookup results to non-lookup contexts.

Fixes https://llvm.org/bugs/show_bug.cgi?id=27186

Patch reviewed by Richard Smith.

llvm-svn: 265597

clang/lib/AST/DeclBase.cpp

diff --git a/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index 5ec05a6..2722b82 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -1559,9 +1559,12 @@
                                                     bool Recoverable) {
   assert(this == getPrimaryContext() && "expected a primary DC");
 
-  // Skip declarations within functions.
-  if (isFunctionOrMethod())
+  if (!isLookupContext()) {
+    if (isTransparentContext())
+      getParent()->getPrimaryContext()
+        ->makeDeclVisibleInContextWithFlags(D, Internal, Recoverable);
     return;
+  }
 
   // Skip declarations which should be invisible to name lookup.
   if (shouldBeHidden(D))