more attribute refactoring/renaming, no functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@52874 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index df75109..7fa180c 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -612,8 +612,8 @@
if (!NewTD) return 0;
// Handle attributes prior to checking for duplicates in MergeVarDecl
- HandleDeclAttributes(NewTD, D.getDeclSpec().getAttributes(),
- D.getAttributes());
+ ProcessDeclAttributes(NewTD, D.getDeclSpec().getAttributes(),
+ D.getAttributes());
// Merge the decl with the existing one if appropriate. If the decl is
// in an outer scope, it isn't the same thing.
if (PrevDecl && IdResolver.isDeclInScope(PrevDecl, CurContext, S)) {
@@ -652,8 +652,8 @@
II, R, SC, isInline,
LastDeclarator);
// Handle attributes.
- HandleDeclAttributes(NewFD, D.getDeclSpec().getAttributes(),
- D.getAttributes());
+ ProcessDeclAttributes(NewFD, D.getDeclSpec().getAttributes(),
+ D.getAttributes());
// Copy the parameter declarations from the declarator D to
// the function declaration NewFD, if they are available.
@@ -745,8 +745,8 @@
II, R, SC, LastDeclarator);
}
// Handle attributes prior to checking for duplicates in MergeVarDecl
- HandleDeclAttributes(NewVD, D.getDeclSpec().getAttributes(),
- D.getAttributes());
+ ProcessDeclAttributes(NewVD, D.getDeclSpec().getAttributes(),
+ D.getAttributes());
// Emit an error if an address space was applied to decl with local storage.
// This includes arrays of objects with address space qualifiers, but not
@@ -1456,8 +1456,8 @@
if (II)
PushOnScopeChains(New, S);
- HandleDeclAttributes(New, D.getDeclSpec().getAttributes(),
- D.getAttributes());
+ ProcessDeclAttributes(New, D.getDeclSpec().getAttributes(),
+ D.getAttributes());
return New;
}
@@ -1725,7 +1725,8 @@
PushOnScopeChains(New, S);
}
- HandleDeclAttributes(New, Attr, 0);
+ if (Attr)
+ ProcessDeclAttributeList(New, Attr);
return New;
}
@@ -1848,8 +1849,8 @@
// FIXME: Chain fielddecls together.
FieldDecl *NewFD = FieldDecl::Create(Context, Loc, II, T, BitWidth);
- HandleDeclAttributes(NewFD, D.getDeclSpec().getAttributes(),
- D.getAttributes());
+ ProcessDeclAttributes(NewFD, D.getDeclSpec().getAttributes(),
+ D.getAttributes());
if (D.getInvalidType() || InvalidDecl)
NewFD->setInvalidDecl();
@@ -1912,8 +1913,8 @@
ObjCIvarDecl *NewID = ObjCIvarDecl::Create(Context, Loc, II, T);
- HandleDeclAttributes(NewID, D.getDeclSpec().getAttributes(),
- D.getAttributes());
+ ProcessDeclAttributes(NewID, D.getDeclSpec().getAttributes(),
+ D.getAttributes());
if (D.getInvalidType() || InvalidDecl)
NewID->setInvalidDecl();