summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorJohn McCall <rjmccall@apple.com>2010-05-01 00:40:08 +0000
committerJohn McCall <rjmccall@apple.com>2010-05-01 00:40:08 +0000
commit0b66eb38c78129f48cc65bbe6867dfc67abae6df (patch)
tree828adbd85e3da21e8441e4fbcab710cee6ce00e8 /clang/lib/Sema/SemaDeclCXX.cpp
parent096619eb523bbcdf9ac5e71adbcc3bae453c8a7c (diff)
downloadbcm5719-llvm-0b66eb38c78129f48cc65bbe6867dfc67abae6df.tar.gz
bcm5719-llvm-0b66eb38c78129f48cc65bbe6867dfc67abae6df.zip
It turns out that basically every caller to RequireCompleteDeclContext
already knows what context it's looking in. Just pass that context in instead of (questionably) recalculating it. llvm-svn: 102818
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 854f204ab06..c73c6caf297 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -3724,7 +3724,7 @@ NamedDecl *Sema::BuildUsingDeclaration(Scope *S, AccessSpecifier AS,
if (!LookupContext) return D;
UsingDecl *UD = cast<UsingDecl>(D);
- if (RequireCompleteDeclContext(SS)) {
+ if (RequireCompleteDeclContext(SS, LookupContext)) {
UD->setInvalidDecl();
return UD;
}
@@ -5251,11 +5251,11 @@ Sema::ActOnFriendFunctionDecl(Scope *S,
LookupResult Previous(*this, Name, D.getIdentifierLoc(), LookupOrdinaryName,
ForRedeclaration);
if (!ScopeQual.isInvalid() && ScopeQual.isSet()) {
- // FIXME: RequireCompleteDeclContext
DC = computeDeclContext(ScopeQual);
// FIXME: handle dependent contexts
if (!DC) return DeclPtrTy();
+ if (RequireCompleteDeclContext(ScopeQual, DC)) return DeclPtrTy();
LookupQualifiedName(Previous, DC);
OpenPOWER on IntegriCloud