diff options
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/Sema.h | 9 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 36 |
2 files changed, 16 insertions, 29 deletions
diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 873cc47d89..d6bc6e51dd 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -2245,12 +2245,9 @@ public: ExprArg AssertExpr, ExprArg AssertMessageExpr); - virtual DeclPtrTy ActOnFriendDecl(Scope *S, - llvm::PointerUnion<const DeclSpec*,Declarator*> D, - bool IsDefinition); - DeclPtrTy ActOnFriendTypeDecl(Scope *S, const DeclSpec& DS, - bool IsDefinition); - DeclPtrTy ActOnFriendFunctionDecl(Scope *S, Declarator& D, bool IsDefinition); + DeclPtrTy ActOnFriendTypeDecl(Scope *S, const DeclSpec &DS); + DeclPtrTy ActOnFriendFunctionDecl(Scope *S, Declarator &D, bool IsDefinition, + MultiTemplateParamsArg TemplateParams); QualType CheckConstructorDeclarator(Declarator &D, QualType R, FunctionDecl::StorageClass& SC); diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index 97d7b2f76d..79b017b330 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -4008,18 +4008,8 @@ Sema::DeclPtrTy Sema::ActOnStaticAssertDeclaration(SourceLocation AssertLoc, return DeclPtrTy::make(Decl); } -Sema::DeclPtrTy Sema::ActOnFriendDecl(Scope *S, - llvm::PointerUnion<const DeclSpec*,Declarator*> DU, - bool IsDefinition) { - if (DU.is<Declarator*>()) - return ActOnFriendFunctionDecl(S, *DU.get<Declarator*>(), IsDefinition); - else - return ActOnFriendTypeDecl(S, *DU.get<const DeclSpec*>(), IsDefinition); -} - Sema::DeclPtrTy Sema::ActOnFriendTypeDecl(Scope *S, - const DeclSpec &DS, - bool IsDefinition) { + const DeclSpec &DS) { SourceLocation Loc = DS.getSourceRange().getBegin(); assert(DS.isFriendSpecified()); @@ -4056,17 +4046,13 @@ Sema::DeclPtrTy Sema::ActOnFriendTypeDecl(Scope *S, } } + bool IsDefinition = false; FriendDecl::FriendUnion FU = T.getTypePtr(); - // The parser doesn't quite handle - // friend class A { ... } - // optimally, because it might have been the (valid) prefix of - // friend class A { ... } foo(); - // So in a very particular set of circumstances, we need to adjust - // IsDefinition. - // - // Also, if we made a RecordDecl in ActOnTag, we want that to be the - // object of our friend declaration. + // We want to do a few things differently if the type was declared with + // a tag: specifically, we want to use the associated RecordDecl as + // the object of our friend declaration, and we want to disallow + // class definitions. switch (DS.getTypeSpecType()) { default: break; case DeclSpec::TST_class: @@ -4106,9 +4092,13 @@ Sema::DeclPtrTy Sema::ActOnFriendTypeDecl(Scope *S, return DeclPtrTy::make(FD); } -Sema::DeclPtrTy Sema::ActOnFriendFunctionDecl(Scope *S, - Declarator &D, - bool IsDefinition) { +Sema::DeclPtrTy +Sema::ActOnFriendFunctionDecl(Scope *S, + Declarator &D, + bool IsDefinition, + MultiTemplateParamsArg TemplateParams) { + // FIXME: do something with template parameters + const DeclSpec &DS = D.getDeclSpec(); assert(DS.isFriendSpecified()); |