diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2012-04-22 15:31:59 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2012-04-22 15:31:59 +0000 |
| commit | f6a8b9cba4893b552704f64dd279b4cdc8c13f6f (patch) | |
| tree | 57b3a70876830c3b9c553f3b5f795fa3f52d1c9d /lib/AST/Decl.cpp | |
| parent | 51183374a54448c54f1b53035cea5b8d885c1c82 (diff) | |
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
Diffstat (limited to 'lib/AST/Decl.cpp')
| -rw-r--r-- | lib/AST/Decl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 41bc4a6e20..870e252745 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -407,8 +407,8 @@ static LinkageInfo getLVForNamespaceScopeDecl(const NamedDecl *D, // The arguments at which the template was instantiated. const TemplateArgumentList &TemplateArgs = spec->getTemplateArgs(); - LV.mergeWithMin(getLVForTemplateArgumentList(TemplateArgs, - OnlyTemplate)); + LV.merge(getLVForTemplateArgumentList(TemplateArgs, + OnlyTemplate)); } } |