[cfe-commits] r155943 - in /cfe/trunk: lib/Sema/SemaDeclAttr.cpp test/Sema/attr-visibility.c test/SemaCXX/attr-visibility.cpp

[Rafael Espindola]

Author: rafael
Date: Tue May  1 15:58:29 2012
New Revision: 155943

URL: http://llvm.org/viewvc/llvm-project?rev=155943&view=rev
Log:
Extend the error about incompatible visibility attributes in different
decls to work on function templates specializations.

Added:
    cfe/trunk/test/SemaCXX/attr-visibility.cpp
Modified:
    cfe/trunk/lib/Sema/SemaDeclAttr.cpp
    cfe/trunk/test/Sema/attr-visibility.c

Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=155943&r1=155942&r2=155943&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Tue May  1 15:58:29 2012
@@ -1752,7 +1752,13 @@
     return;
   }
 
-  VisibilityAttr *PrevAttr = D->getCanonicalDecl()->getAttr<VisibilityAttr>();
+  Decl *PrevDecl;
+  if (isa<FunctionDecl>(D))
+    PrevDecl = D->getMostRecentDecl()->getPreviousDecl();
+  else
+    PrevDecl = D->getCanonicalDecl();
+
+  VisibilityAttr *PrevAttr = PrevDecl ? PrevDecl->getAttr<VisibilityAttr>() : 0;
   if (PrevAttr) {
     VisibilityAttr::VisibilityType PrevVisibility = PrevAttr->getVisibility();
     if (PrevVisibility != type) {

Modified: cfe/trunk/test/Sema/attr-visibility.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/attr-visibility.c?rev=155943&r1=155942&r2=155943&view=diff
==============================================================================
--- cfe/trunk/test/Sema/attr-visibility.c (original)
+++ cfe/trunk/test/Sema/attr-visibility.c Tue May  1 15:58:29 2012
@@ -8,4 +8,5 @@
 void test3() __attribute__((visibility("protected"))); // expected-warning {{target does not support 'protected' visibility; using 'default'}}
 
 struct __attribute__((visibility("hidden"))) test4; // expected-note {{previous attribute is here}}
+struct test4;
 struct __attribute__((visibility("default"))) test4; // expected-error {{visibility does not match previous declaration}}

Added: cfe/trunk/test/SemaCXX/attr-visibility.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/attr-visibility.cpp?rev=155943&view=auto
==============================================================================
--- cfe/trunk/test/SemaCXX/attr-visibility.cpp (added)
+++ cfe/trunk/test/SemaCXX/attr-visibility.cpp Tue May  1 15:58:29 2012
@@ -0,0 +1,16 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+template <class Element>
+void foo() {
+}
+template <>
+ __attribute__((visibility("hidden")))  // expected-note {{previous attribute is here}}
+void foo<int>();
+
+template <>
+void foo<int>();
+
+template <>
+ __attribute__((visibility("default"))) // expected-error {{visibility does not match previous declaration}}
+void foo<int>() {
+}