From b2829203384ab529c0ba13696acca68f7c79d000 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Thu, 29 Nov 2012 16:38:22 +0000 Subject: [PATCH] Now that the underlying problem has been fixed, add r168411 back. Original commit message: Remove redundant code. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@168900 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/Decl.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index ed48c439b5..1f390eec05 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -777,12 +777,10 @@ static LinkageInfo getLVForDecl(const NamedDecl *D, bool OnlyTemplate) { if (llvm::Optional Vis = Function->getExplicitVisibility()) LV.mergeVisibility(*Vis, true); } - - if (const FunctionDecl *Prev = Function->getPreviousDecl()) { - LinkageInfo PrevLV = getLVForDecl(Prev, OnlyTemplate); - if (PrevLV.linkage()) LV.setLinkage(PrevLV.linkage()); - LV.mergeVisibility(PrevLV); - } + + // Note that Sema::MergeCompatibleFunctionDecls already takes care of + // merging storage classes and visibility attributes, so we don't have to + // look at previous decls in here. return LV; } -- 2.40.0