diff options
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclAttr.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Sema/attr-used.c | 8 | ||||
| -rw-r--r-- | clang/test/SemaCXX/attr-used.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 30ec0c4e4bc..9ed9510a659 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -8934,7 +8934,7 @@ Sema::FinalizeDeclaration(Decl *ThisDecl) { if (UsedAttr *Attr = VD->getAttr<UsedAttr>()) { if (!Attr->isInherited() && !VD->isThisDeclarationADefinition()) { - Diag(Attr->getLocation(), diag::warn_attribute_ignored) << "used"; + Diag(Attr->getLocation(), diag::warn_attribute_ignored) << "'used'"; VD->dropAttr<UsedAttr>(); } } diff --git a/clang/lib/Sema/SemaDeclAttr.cpp b/clang/lib/Sema/SemaDeclAttr.cpp index 66fce3410a2..26988b23268 100644 --- a/clang/lib/Sema/SemaDeclAttr.cpp +++ b/clang/lib/Sema/SemaDeclAttr.cpp @@ -1622,7 +1622,7 @@ static void handleUnusedAttr(Sema &S, Decl *D, const AttributeList &Attr) { static void handleUsedAttr(Sema &S, Decl *D, const AttributeList &Attr) { if (const VarDecl *VD = dyn_cast<VarDecl>(D)) { if (VD->hasLocalStorage()) { - S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << "used"; + S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName(); return; } } else if (!isFunctionOrMethod(D)) { diff --git a/clang/test/Sema/attr-used.c b/clang/test/Sema/attr-used.c index accc7b620b5..4e3bda7609b 100644 --- a/clang/test/Sema/attr-used.c +++ b/clang/test/Sema/attr-used.c @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -verify -fsyntax-only -Wno-private-extern %s -extern int l0 __attribute__((used)); // expected-warning {{used attribute ignored}} -__private_extern__ int l1 __attribute__((used)); // expected-warning {{used attribute ignored}} +extern int l0 __attribute__((used)); // expected-warning {{'used' attribute ignored}} +__private_extern__ int l1 __attribute__((used)); // expected-warning {{'used' attribute ignored}} struct __attribute__((used)) s { // expected-warning {{'used' attribute only applies to variables and functions}} int x; @@ -13,8 +13,8 @@ static void __attribute__((used)) f0(void) { } void f1() { - static int a __attribute__((used)); - int b __attribute__((used)); // expected-warning {{used attribute ignored}} + static int a __attribute__((used)); + int b __attribute__((used)); // expected-warning {{'used' attribute ignored}} } static void __attribute__((used)) f0(void); diff --git a/clang/test/SemaCXX/attr-used.cpp b/clang/test/SemaCXX/attr-used.cpp index 9bae3edc7f8..65df861f832 100644 --- a/clang/test/SemaCXX/attr-used.cpp +++ b/clang/test/SemaCXX/attr-used.cpp @@ -1,5 +1,5 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s -extern char test1[] __attribute__((used)); // expected-warning {{used attribute ignored}} -extern const char test2[] __attribute__((used)); // expected-warning {{used attribute ignored}} +extern char test1[] __attribute__((used)); // expected-warning {{'used' attribute ignored}} +extern const char test2[] __attribute__((used)); // expected-warning {{'used' attribute ignored}} extern const char test3[] __attribute__((used)) = ""; |
