r134634 causes a failure on MultiSource/Benchmarks/Olden/bh with TEST=nightly,
so roll it out.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134638 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index f2bd47d..e2fa4e5 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -6376,7 +6376,7 @@
if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
// Forward declarations aren't required.
if (!FD->doesThisDeclarationHaveABody())
- return FD->doesDeclarationForceExternallyVisibleDefinition();
+ return false;
// Constructors and destructors are required.
if (FD->hasAttr<ConstructorAttr>() || FD->hasAttr<DestructorAttr>())
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 9feec9d..9b507cf 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -1762,32 +1762,6 @@
return false;
}
-/// \brief For a function declaration in C or C++, determine whether this
-/// declaration causes the definition to be externally visible.
-///
-/// Determines whether this is the first non-inline redeclaration of an inline
-/// function in a language where "inline" does not normally require an
-/// externally visible definition.
-bool FunctionDecl::doesDeclarationForceExternallyVisibleDefinition() const {
- assert(!doesThisDeclarationHaveABody() &&
- "Must have a declaration without a body.");
-
- ASTContext &Context = getASTContext();
-
- // In C99 mode, a function may have an inline definition (causing it to
- // be deferred) then redeclared later. As a special case, "extern inline"
- // is not required to produce an external symbol.
- if (Context.getLangOptions().GNUInline || !Context.getLangOptions().C99 ||
- Context.getLangOptions().CPlusPlus)
- return false;
- if (getLinkage() != ExternalLinkage || isInlineSpecified())
- return false;
- const FunctionDecl *InlineDefinition = 0;
- if (hasBody(InlineDefinition))
- return InlineDefinition->isInlineDefinitionExternallyVisible();
- return false;
-}
-
/// \brief For an inline function definition in C or C++, determine whether the
/// definition will be externally visible.
///
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index b290529..ddef397 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -597,7 +597,7 @@
void CodeGenModule::EmitDeferred() {
// Emit code for any potentially referenced deferred decls. Since a
// previously unused static decl may become used during the generation of code
- // for a static function, iterate until no changes are made.
+ // for a static function, iterate until no changes are made.
while (!DeferredDeclsToEmit.empty() || !DeferredVTables.empty()) {
if (!DeferredVTables.empty()) {
@@ -740,21 +740,8 @@
}
// Forward declarations are emitted lazily on first use.
- if (!FD->doesThisDeclarationHaveABody()) {
- if (!FD->doesDeclarationForceExternallyVisibleDefinition())
- return;
-
- const FunctionDecl *InlineDefinition = 0;
- FD->getBody(InlineDefinition);
-
- llvm::StringRef MangledName = getMangledName(GD);
- llvm::StringMap<GlobalDecl>::iterator DDI =
- DeferredDecls.find(MangledName);
- if (DDI != DeferredDecls.end())
- DeferredDecls.erase(DDI);
- EmitGlobalDefinition(InlineDefinition);
+ if (!FD->doesThisDeclarationHaveABody())
return;
- }
} else {
const VarDecl *VD = cast<VarDecl>(Global);
assert(VD->isFileVarDecl() && "Cannot emit local var decl as global.");