commit f6a8b9cba4893b552704f64dd279b4cdc8c13f6f
author Rafael Espindola <rafael.espindola@gmail.com> Sun Apr 22 15:31:59 2012 +0000
committer Rafael Espindola <rafael.espindola@gmail.com> Sun Apr 22 15:31:59 2012 +0000
tree 57b3a70876830c3b9c553f3b5f795fa3f52d1c9d
parent 51183374a54448c54f1b53035cea5b8d885c1c82

An attribute in a explicit template installation should take precedence over
the tempale arguments in deciding the visibility.

This agrees with gcc 4.7.

Found by trying to build chrome with component=shared_library with 155314
reverted.

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

lib/AST/Decl.cpp

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 41bc4a6..870e252 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -407,8 +407,8 @@
 
         // The arguments at which the template was instantiated.
         const TemplateArgumentList &TemplateArgs = spec->getTemplateArgs();
-        LV.mergeWithMin(getLVForTemplateArgumentList(TemplateArgs,
-                                                     OnlyTemplate));
+        LV.merge(getLVForTemplateArgumentList(TemplateArgs,
+                                              OnlyTemplate));
       }
     }