diff options
| -rw-r--r-- | clang/lib/Sema/TargetAttributesSema.cpp | 10 | ||||
| -rw-r--r-- | clang/test/Sema/dllimport-dllexport.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/clang/lib/Sema/TargetAttributesSema.cpp b/clang/lib/Sema/TargetAttributesSema.cpp index 375e39cae07..1469e1247f6 100644 --- a/clang/lib/Sema/TargetAttributesSema.cpp +++ b/clang/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/clang/test/Sema/dllimport-dllexport.c b/clang/test/Sema/dllimport-dllexport.c index 80810d696e8..198c25f90ca 100644 --- a/clang/test/Sema/dllimport-dllexport.c +++ b/clang/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}} |
