commit 84d8767c1582d1ee300ecf9899b76d57a34c3597
author John McCall <rjmccall@apple.com> Thu Dec 10 09:41:52 2009 +0000
committer John McCall <rjmccall@apple.com> Thu Dec 10 09:41:52 2009 +0000
tree 1d36caa744cc145503c6493c21da4d1b945b6cea
parent e919e382a4fa116b3a15cb8855dd928f0ce674a2

Implement redeclaration checking and hiding semantics for using declarations.  There
are a couple of O(n^2) operations in this, some analogous to the usual O(n^2)
redeclaration problem and some not.  In particular, retroactively removing
shadow declarations when they're hidden by later decls is pretty unfortunate.
I'm not yet convinced it's worse than the alternative, though.

llvm-svn: 91045

clang/lib/Sema/Sema.h

diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h
index ad903a0..22e6b14 100644
--- a/clang/lib/Sema/Sema.h
+++ b/clang/lib/Sema/Sema.h
@@ -616,7 +616,8 @@
                                      bool IsFunctionDefinition,
                                      bool &Redeclaration);
   void AddOverriddenMethods(CXXRecordDecl *DC, CXXMethodDecl *MD);
-  void CheckFunctionDeclaration(FunctionDecl *NewFD, LookupResult &Previous,
+  void CheckFunctionDeclaration(Scope *S,
+                                FunctionDecl *NewFD, LookupResult &Previous,
                                 bool IsExplicitSpecialization,
                                 bool &Redeclaration,
                                 bool &OverloadableAttrRequired);
@@ -839,7 +840,7 @@
     Ovl_NonFunction
   };
   OverloadKind CheckOverload(FunctionDecl *New,
-                             LookupResult &OldDecls,
+                             const LookupResult &OldDecls,
                              NamedDecl *&OldDecl);
   bool IsOverload(FunctionDecl *New, FunctionDecl *Old);
 
@@ -1123,6 +1124,10 @@
     /// namespace alias definition, ignoring non-namespace names (C++
     /// [basic.lookup.udir]p1).
     LookupNamespaceName,
+    /// Look up all declarations in a scope with the given name,
+    /// including resolved using declarations.  This is appropriate
+    /// for checking redeclarations for a using declaration.
+    LookupUsingDeclName,
     /// Look up an ordinary name that is going to be redeclared as a
     /// name with linkage. This lookup ignores any declarations that
     /// are outside of the current scope unless they have linkage. See
@@ -1154,6 +1159,7 @@
     case Sema::LookupTagName:
     case Sema::LookupMemberName:
     case Sema::LookupRedeclarationWithLinkage: // FIXME: check linkage, scoping
+    case Sema::LookupUsingDeclName:
     case Sema::LookupObjCProtocolName:
     case Sema::LookupObjCImplementationName:
     case Sema::LookupObjCCategoryImplName:
@@ -1739,9 +1745,17 @@
                                            SourceLocation IdentLoc,
                                            IdentifierInfo *Ident);
 
-  UsingShadowDecl *BuildUsingShadowDecl(Scope *S, AccessSpecifier AS,
-                                        UsingDecl *UD, NamedDecl *Target);
+  void HideUsingShadowDecl(Scope *S, UsingShadowDecl *Shadow);
+  bool CheckUsingShadowDecl(UsingDecl *UD, NamedDecl *Target,
+                            const LookupResult &PreviousDecls);
+  UsingShadowDecl *BuildUsingShadowDecl(Scope *S, UsingDecl *UD,
+                                        NamedDecl *Target);
 
+  bool CheckUsingDeclRedeclaration(SourceLocation UsingLoc,
+                                   bool isTypeName,
+                                   const CXXScopeSpec &SS,
+                                   SourceLocation NameLoc,
+                                   const LookupResult &Previous);
   bool CheckUsingDeclQualifier(SourceLocation UsingLoc,
                                const CXXScopeSpec &SS,
                                SourceLocation NameLoc);