diff options
| author | John McCall <rjmccall@apple.com> | 2010-10-13 06:22:15 +0000 |
|---|---|---|
| committer | John McCall <rjmccall@apple.com> | 2010-10-13 06:22:15 +0000 |
| commit | 380aaa44213c7ddff95117a30d5c6cec05a911d5 (patch) | |
| tree | 32830df4c671bfc00a70ff36a7a53785b42a39d1 | |
| parent | 29ae6e5fb001deddd831e66faf143ecd9e50f67c (diff) | |
Preserve the original scope when picking the right scope for a friend
declaration, because we'll need it later. Hopefully fixed self-host.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@116399 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 62ac3bb455..55f668b5c5 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -6337,6 +6337,7 @@ Decl *Sema::ActOnFriendFunctionDecl(Scope *S, Declarator &D, bool IsDefinition, // The context we found the declaration in, or in which we should // create the declaration. DeclContext *DC; + Scope *DCScope = S; LookupResult Previous(*this, NameInfo, LookupOrdinaryName, ForRedeclaration); @@ -6395,7 +6396,7 @@ Decl *Sema::ActOnFriendFunctionDecl(Scope *S, Declarator &D, bool IsDefinition, && !getLangOptions().CPlusPlus0x) Diag(DS.getFriendSpecLoc(), diag::err_friend_is_member); - S = getScopeForDeclContext(S, DC); + DCScope = getScopeForDeclContext(S, DC); // - There's a non-dependent scope specifier, in which case we // compute it and do a previous lookup there for a function @@ -6454,7 +6455,7 @@ Decl *Sema::ActOnFriendFunctionDecl(Scope *S, Declarator &D, bool IsDefinition, } bool Redeclaration = false; - NamedDecl *ND = ActOnFunctionDeclarator(S, D, DC, T, TInfo, Previous, + NamedDecl *ND = ActOnFunctionDeclarator(DCScope, D, DC, T, TInfo, Previous, move(TemplateParams), IsDefinition, Redeclaration); |