Skip to content

Commit

Permalink
Function with unparsed body is a definition
Browse files Browse the repository at this point in the history
While a function body is being parsed, the function declaration is not considered
as a definition because it does not have a body yet. In some cases it leads to
incorrect interpretation, the case is presented in
https://bugs.llvm.org/show_bug.cgi?id=14785:
```
    template<typename T> struct Somewhat {
      void internal() const {}
      friend void operator+(int const &, Somewhat<T> const &) {}
    };
void operator+(int const &, Somewhat<char> const &x) { x.internal(); }
```
When statement `x.internal()` in the body of global `operator+` is parsed, the type
of `x` must be completed, so the instantiation of `Somewhat<char>` is started. It
instantiates the declaration of `operator+` defined inline, and makes a check for
redefinition. The check does not detect another definition because the declaration
of `operator+` is still not defining as does not have a body yet.

To solves this problem the function `isThisDeclarationADefinition` considers
a function declaration as a definition if it has flag `WillHaveBody` set.

This change fixes PR14785.

Differential Revision: https://reviews.llvm.org/D30375

llvm-svn: 305379
  • Loading branch information
spavloff committed Jun 14, 2017
1 parent 0c29ef1 commit c73c81b
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 8 deletions.
2 changes: 1 addition & 1 deletion clang/include/clang/AST/Decl.h
Expand Up @@ -1872,7 +1872,7 @@ class FunctionDecl : public DeclaratorDecl, public DeclContext,
///
bool isThisDeclarationADefinition() const {
return IsDeleted || IsDefaulted || Body || IsLateTemplateParsed ||
hasDefiningAttr();
WillHaveBody || hasDefiningAttr();
}

/// doesThisDeclarationHaveABody - Returns whether this specific
Expand Down
6 changes: 0 additions & 6 deletions clang/lib/Sema/SemaCUDA.cpp
Expand Up @@ -629,12 +629,6 @@ static bool IsKnownEmitted(Sema &S, FunctionDecl *FD) {
// emitted, because (say) the definition could include "inline".
FunctionDecl *Def = FD->getDefinition();

// We may currently be parsing the body of FD, in which case
// FD->getDefinition() will be null, but we still want to treat FD as though
// it's a definition.
if (!Def && FD->willHaveBody())
Def = FD;

if (Def &&
!isDiscardableGVALinkage(S.getASTContext().GetGVALinkageForFunction(Def)))
return true;
Expand Down
1 change: 1 addition & 0 deletions clang/lib/Sema/SemaDecl.cpp
Expand Up @@ -12218,6 +12218,7 @@ Decl *Sema::ActOnFinishFunctionBody(Decl *dcl, Stmt *Body,

if (FD) {
FD->setBody(Body);
FD->setWillHaveBody(false);

if (getLangOpts().CPlusPlus14) {
if (!FD->isInvalidDecl() && Body && !FD->isDependentContext() &&
Expand Down
3 changes: 3 additions & 0 deletions clang/lib/Sema/SemaDeclCXX.cpp
Expand Up @@ -13878,6 +13878,9 @@ void Sema::SetDeclDeleted(Decl *Dcl, SourceLocation DelLoc) {
return;
}

// Deleted function does not have a body.
Fn->setWillHaveBody(false);

if (const FunctionDecl *Prev = Fn->getPreviousDecl()) {
// Don't consider the implicit declaration we generate for explicit
// specializations. FIXME: Do not generate these implicit declarations.
Expand Down
7 changes: 6 additions & 1 deletion clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
Expand Up @@ -1782,6 +1782,12 @@ Decl *TemplateDeclInstantiator::VisitFunctionDecl(FunctionDecl *D,
Previous.clear();
}

if (isFriend) {
Function->setObjectOfFriendDecl();
if (FunctionTemplate)
FunctionTemplate->setObjectOfFriendDecl();
}

SemaRef.CheckFunctionDeclaration(/*Scope*/ nullptr, Function, Previous,
isExplicitSpecialization);

Expand All @@ -1792,7 +1798,6 @@ Decl *TemplateDeclInstantiator::VisitFunctionDecl(FunctionDecl *D,
// If the original function was part of a friend declaration,
// inherit its namespace state and add it to the owner.
if (isFriend) {
PrincipalDecl->setObjectOfFriendDecl();
DC->makeDeclVisibleInContext(PrincipalDecl);

bool QueuedInstantiation = false;
Expand Down
12 changes: 12 additions & 0 deletions clang/test/SemaCXX/friend2.cpp
Expand Up @@ -170,3 +170,15 @@ struct Test {
template class Test<int>;

}

namespace pr14785 {
template<typename T>
struct Somewhat {
void internal() const { }
friend void operator+(int const &, Somewhat<T> const &) {} // expected-error{{redefinition of 'operator+'}}
};

void operator+(int const &, Somewhat<char> const &x) { // expected-note {{previous definition is here}}
x.internal(); // expected-note{{in instantiation of template class 'pr14785::Somewhat<char>' requested here}}
}
}

0 comments on commit c73c81b

Please sign in to comment.