diff options
| author | John McCall <rjmccall@apple.com> | 2010-06-16 08:42:20 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-06-16 08:42:20 +0000 |
| commit | e9cccd86da2fe29b7488e4888fa09c6834c82f31 (patch) | |
| tree | 5a7b17c3fc2c082838d3ecae813af472a552eab5 /clang/lib/Sema/Sema.h | |
| parent | f128bdcb557e20b20d02ca0351aa4ff19a1b0c42 (diff) | |
| download | bcm5719-llvm-e9cccd86da2fe29b7488e4888fa09c6834c82f31.tar.gz bcm5719-llvm-e9cccd86da2fe29b7488e4888fa09c6834c82f31.zip | |
Fix a point of semantics with using declaration hiding: method templates
introduced by using decls are hidden even if their template parameter lists
or return types differ from the "overriding" declaration.
Propagate using shadow declarations around more effectively when looking up
template-ids. Reperform lookup for template-ids in member expressions so that
access control is properly set up.
Fix some number of latent bugs involving template-ids with totally invalid
base types. You can only actually get these with a scope specifier, since
otherwise the template-id won't parse as a template-id.
Fixes PR7384.
llvm-svn: 106093
Diffstat (limited to 'clang/lib/Sema/Sema.h')
| -rw-r--r-- | clang/lib/Sema/Sema.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clang/lib/Sema/Sema.h b/clang/lib/Sema/Sema.h index 48b8d05d918..396f144ddf2 100644 --- a/clang/lib/Sema/Sema.h +++ b/clang/lib/Sema/Sema.h @@ -1103,10 +1103,12 @@ public: /// non-function. Ovl_NonFunction }; - OverloadKind CheckOverload(FunctionDecl *New, + OverloadKind CheckOverload(Scope *S, + FunctionDecl *New, const LookupResult &OldDecls, - NamedDecl *&OldDecl); - bool IsOverload(FunctionDecl *New, FunctionDecl *Old); + NamedDecl *&OldDecl, + bool IsForUsingDecl); + bool IsOverload(FunctionDecl *New, FunctionDecl *Old, bool IsForUsingDecl); bool TryImplicitConversion(InitializationSequence &Sequence, const InitializedEntity &Entity, @@ -1952,7 +1954,8 @@ public: OwningExprResult LookupMemberExpr(LookupResult &R, Expr *&Base, bool &IsArrow, SourceLocation OpLoc, CXXScopeSpec &SS, - DeclPtrTy ObjCImpDecl); + DeclPtrTy ObjCImpDecl, + bool HasTemplateArgs); bool CheckQualifiedMemberReference(Expr *BaseExpr, QualType BaseType, const CXXScopeSpec &SS, |

