From: Douglas Gregor <dgregor@apple.com>
Date: Mon, 6 Dec 2010 18:50:56 +0000 (+0000)
Subject: Use the unused merge() function, fixing an minor, unintended change I
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89d63e5e4f4423455f7ee6b1e85143c34d088128;p=clang

Use the unused merge() function, fixing an minor, unintended change I
introduced in r121023.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@121025 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 90a561e5c6..d4cffb9b68 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -102,7 +102,7 @@ struct LVFlags {
     F.ConsiderVisibilityAttributes = false;
     return F;
   }
-};
+}; 
 } // end anonymous namespace
 
 /// \brief Get the most restrictive linkage for the types in the given
@@ -153,18 +153,14 @@ static LVPair getLVForTemplateArgumentList(const TemplateArgument *Args,
       // The decl can validly be null as the representation of nullptr
       // arguments, valid only in C++0x.
       if (Decl *D = Args[I].getAsDecl()) {
-        if (NamedDecl *ND = dyn_cast<NamedDecl>(D)) {
-          LinkageInfo LI = getLVForDecl(ND, F);
-          LV = merge(LV, LVPair(LI.linkage(), LI.visibility()));
-        }
+        if (NamedDecl *ND = dyn_cast<NamedDecl>(D))
+          LV = merge(LV, getLVForDecl(ND, F));
       }
       break;
 
     case TemplateArgument::Template:
-      if (TemplateDecl *Template = Args[I].getAsTemplate().getAsTemplateDecl()){
-        LinkageInfo LI = getLVForDecl(Template, F);
-        LV = merge(LV, LVPair(LI.linkage(), LI.visibility()));
-      }
+      if (TemplateDecl *Template = Args[I].getAsTemplate().getAsTemplateDecl())
+        LV = merge(LV, getLVForDecl(Template, F));
       break;
 
     case TemplateArgument::Pack: