From: Aaron Ballman <aaron@aaronballman.com>
Date: Wed, 4 Dec 2013 22:02:33 +0000 (+0000)
Subject: Getting rid of some hard-coded strings. No functional changes intended, though some... 
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d15c74bf8a78251992f752a442001afc1dfba75;p=clang

Getting rid of some hard-coded strings. No functional changes intended, though some test cases needed to be updated for attribute names becoming quoted.

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

diff --git a/lib/Sema/TargetAttributesSema.cpp b/lib/Sema/TargetAttributesSema.cpp
index 375e39cae0..1469e1247f 100644
--- a/lib/Sema/TargetAttributesSema.cpp
+++ b/lib/Sema/TargetAttributesSema.cpp
@@ -61,7 +61,7 @@ namespace {
     ARMAttributesSema() { }
     bool ProcessDeclAttribute(Scope *scope, Decl *D,
                               const AttributeList &Attr, Sema &S) const {
-      if (Attr.getName()->getName() == "interrupt") {
+      if (Attr.getKind() == AttributeList::AT_ARMInterrupt) {
         HandleARMInterruptAttr(D, Attr, S);
         return true;
       }
@@ -195,7 +195,7 @@ static void HandleDLLImportAttr(Decl *D, const AttributeList &Attr, Sema &S) {
   // Currently, the dllimport attribute is ignored for inlined functions.
   // Warning is emitted.
   if (FD && FD->isInlineSpecified()) {
-    S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << "dllimport";
+    S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName();
     return;
   }
 
@@ -239,7 +239,7 @@ static void HandleDLLExportAttr(Decl *D, const AttributeList &Attr, Sema &S) {
   // the -fkeep-inline-functions flag has been used. Warning is emitted;
   if (FD && FD->isInlineSpecified()) {
     // FIXME: ... unless the -fkeep-inline-functions flag has been used.
-    S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << "dllexport";
+    S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName();
     return;
   }
 
@@ -317,10 +317,10 @@ namespace {
     MipsAttributesSema() { }
     bool ProcessDeclAttribute(Scope *scope, Decl *D, const AttributeList &Attr,
                               Sema &S) const {
-      if (Attr.getName()->getName() == "mips16") {
+      if (Attr.getKind() == AttributeList::AT_Mips16) {
         HandleMips16Attr(D, Attr, S);
         return true;
-      } else if (Attr.getName()->getName() == "nomips16") {
+      } else if (Attr.getKind() == AttributeList::AT_NoMips16) {
         HandleNoMips16Attr(D, Attr, S);
         return true;
       }
diff --git a/test/Sema/dllimport-dllexport.c b/test/Sema/dllimport-dllexport.c
index 80810d696e..198c25f90c 100644
--- a/test/Sema/dllimport-dllexport.c
+++ b/test/Sema/dllimport-dllexport.c
@@ -1,8 +1,8 @@
 // RUN: %clang_cc1 -triple i386-mingw32 -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple x86_64-mingw32 -fsyntax-only -verify %s
 
-inline void __attribute__((dllexport)) foo1(){} // expected-warning{{dllexport attribute ignored}}
-inline void __attribute__((dllimport)) foo2(){} // expected-warning{{dllimport attribute ignored}}
+inline void __attribute__((dllexport)) foo1(){} // expected-warning{{'dllexport' attribute ignored}}
+inline void __attribute__((dllimport)) foo2(){} // expected-warning{{'dllimport' attribute ignored}}
 
 void __attribute__((dllimport)) foo3(){} // expected-error{{dllimport attribute can be applied only to symbol declaration}}
 
@@ -19,8 +19,8 @@ void __attribute__((dllimport)) foo6();
 void foo6(){} // expected-warning {{'foo6' redeclared without dllimport attribute: previous dllimport ignored}}
 
 // PR6269
-inline void __declspec(dllexport) foo7(){} // expected-warning{{dllexport attribute ignored}}
-inline void __declspec(dllimport) foo8(){} // expected-warning{{dllimport attribute ignored}}
+inline void __declspec(dllexport) foo7(){} // expected-warning{{'dllexport' attribute ignored}}
+inline void __declspec(dllimport) foo8(){} // expected-warning{{'dllimport' attribute ignored}}
 
 void __declspec(dllimport) foo9(){} // expected-error{{dllimport attribute can be applied only to symbol declaration}}