From: Rafael Espindola Date: Wed, 21 Nov 2012 02:53:22 +0000 (+0000) Subject: Remove redundant code. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16c8cf1c3c5e4265b90103a7b5e924e567ab5cd1;p=clang Remove redundant code. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@168411 91177308-0d34-0410-b5e6-96231b3b80d8 --- 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; }