commit 5d1d9e381e6b1744dc55b047f7c83f078069d2dd
author Douglas Gregor <dgregor@apple.com> Mon May 09 21:46:33 2011 +0000
committer Douglas Gregor <dgregor@apple.com> Mon May 09 21:46:33 2011 +0000
tree 0a0c4b021f1b12c7e318d6b8bc4d153a777da345
parent 88c75c311fc80fb12d7226e93da5db6db1e78b7a

Extend the tag-ambiguity hack I committed in r130810 for tag
definitions to also include tag declarations. Fixes PR8151.

llvm-svn: 131102

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 71bea3c..cd6dc92 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -6763,7 +6763,8 @@
     // shouldn't be diagnosing.
     LookupName(Previous, S);
 
-    if (Previous.isAmbiguous() && TUK == TUK_Definition) {
+    if (Previous.isAmbiguous() && 
+        (TUK == TUK_Definition || TUK == TUK_Declaration)) {
       LookupResult::Filter F = Previous.makeFilter();
       while (F.hasNext()) {
         NamedDecl *ND = F.next();
@@ -6771,9 +6772,6 @@
           F.erase();
       }
       F.done();
-      
-      if (Previous.isAmbiguous())
-        return 0;
     }
     
     // Note:  there used to be some attempt at recovery here.