[cfe-commits] r169652 - in /cfe/trunk/lib/CodeGen: CGCall.cpp CGStmt.cpp CodeGenModule.cpp TargetInfo.cpp

[Bill Wendling]

Author: void
Date: Fri Dec  7 17:17:26 2012
New Revision: 169652

URL: http://llvm.org/viewvc/llvm-project?rev=169652&view=rev
Log:
s/AttrListPtr/AttributeSet/g to better label what this class is going to be in the near future.

Modified:
    cfe/trunk/lib/CodeGen/CGCall.cpp
    cfe/trunk/lib/CodeGen/CGStmt.cpp
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp
    cfe/trunk/lib/CodeGen/TargetInfo.cpp

Modified: cfe/trunk/lib/CodeGen/CGCall.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGCall.cpp?rev=169652&r1=169651&r2=169652&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGCall.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGCall.cpp Fri Dec  7 17:17:26 2012
@@ -1049,7 +1049,7 @@
 
   if (RetAttrs.hasAttributes())
     PAL.push_back(llvm::
-                  AttributeWithIndex::get(llvm::AttrListPtr::ReturnIndex,
+                  AttributeWithIndex::get(llvm::AttributeSet::ReturnIndex,
                                          llvm::Attributes::get(getLLVMContext(),
                                                                RetAttrs)));
 
@@ -1136,7 +1136,7 @@
   }
   if (FuncAttrs.hasAttributes())
     PAL.push_back(llvm::
-                  AttributeWithIndex::get(llvm::AttrListPtr::FunctionIndex,
+                  AttributeWithIndex::get(llvm::AttributeSet::FunctionIndex,
                                          llvm::Attributes::get(getLLVMContext(),
                                                                FuncAttrs)));
 }
@@ -2230,7 +2230,7 @@
   unsigned CallingConv;
   CodeGen::AttributeListType AttributeList;
   CGM.ConstructAttributeList(CallInfo, TargetDecl, AttributeList, CallingConv);
-  llvm::AttrListPtr Attrs = llvm::AttrListPtr::get(getLLVMContext(),
+  llvm::AttributeSet Attrs = llvm::AttributeSet::get(getLLVMContext(),
                                                    AttributeList);
 
   llvm::BasicBlock *InvokeDest = 0;

Modified: cfe/trunk/lib/CodeGen/CGStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGStmt.cpp?rev=169652&r1=169651&r2=169652&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGStmt.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGStmt.cpp Fri Dec  7 17:17:26 2012
@@ -1640,7 +1640,7 @@
     llvm::InlineAsm::get(FTy, AsmString, Constraints, HasSideEffect,
                          /* IsAlignStack */ false, AsmDialect);
   llvm::CallInst *Result = Builder.CreateCall(IA, Args);
-  Result->addAttribute(llvm::AttrListPtr::FunctionIndex,
+  Result->addAttribute(llvm::AttributeSet::FunctionIndex,
                        llvm::Attributes::get(getLLVMContext(),
                                              llvm::Attributes::NoUnwind));
 

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=169652&r1=169651&r2=169652&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Fri Dec  7 17:17:26 2012
@@ -533,7 +533,7 @@
   unsigned CallingConv;
   AttributeListType AttributeList;
   ConstructAttributeList(Info, D, AttributeList, CallingConv);
-  F->setAttributes(llvm::AttrListPtr::get(getLLVMContext(), AttributeList));
+  F->setAttributes(llvm::AttributeSet::get(getLLVMContext(), AttributeList));
   F->setCallingConv(static_cast<llvm::CallingConv::ID>(CallingConv));
 }
 
@@ -1143,7 +1143,7 @@
   if (D.getDecl())
     SetFunctionAttributes(D, F, IsIncompleteFunction);
   if (ExtraAttrs.hasAttributes())
-    F->addAttribute(llvm::AttrListPtr::FunctionIndex, ExtraAttrs);
+    F->addAttribute(llvm::AttributeSet::FunctionIndex, ExtraAttrs);
 
   // This is the first use or definition of a mangled name.  If there is a
   // deferred decl with this name, remember that we need to emit it at the end
@@ -1819,7 +1819,7 @@
 
     // Get the attribute list.
     llvm::SmallVector<llvm::AttributeWithIndex, 8> AttrVec;
-    llvm::AttrListPtr AttrList = CI->getAttributes();
+    llvm::AttributeSet AttrList = CI->getAttributes();
 
     // Get any return attributes.
     llvm::Attributes RAttrs = AttrList.getRetAttributes();
@@ -1827,7 +1827,7 @@
     // Add the return attributes.
     if (RAttrs.hasAttributes())
       AttrVec.push_back(llvm::
-                        AttributeWithIndex::get(llvm::AttrListPtr::ReturnIndex,
+                        AttributeWithIndex::get(llvm::AttributeSet::ReturnIndex,
                                                 RAttrs));
 
     // If the function was passed too few arguments, don't transform.  If extra
@@ -1854,7 +1854,7 @@
     llvm::Attributes FnAttrs =  AttrList.getFnAttributes();
     if (FnAttrs.hasAttributes())
       AttrVec.push_back(llvm::
-                       AttributeWithIndex::get(llvm::AttrListPtr::FunctionIndex,
+                       AttributeWithIndex::get(llvm::AttributeSet::FunctionIndex,
                                                FnAttrs));
 
     // Okay, we can transform this.  Create the new call instruction and copy
@@ -1864,7 +1864,7 @@
     ArgList.clear();
     if (!NewCall->getType()->isVoidTy())
       NewCall->takeName(CI);
-    NewCall->setAttributes(llvm::AttrListPtr::get(OldFn->getContext(), AttrVec));
+    NewCall->setAttributes(llvm::AttributeSet::get(OldFn->getContext(), AttrVec));
     NewCall->setCallingConv(CI->getCallingConv());
 
     // Finally, remove the old call, replacing any uses with the new one.

Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=169652&r1=169651&r2=169652&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Fri Dec  7 17:17:26 2012
@@ -1019,7 +1019,7 @@
       // Now add the 'alignstack' attribute with a value of 16.
       llvm::AttrBuilder B;
       B.addStackAlignmentAttr(16);
-      Fn->addAttribute(llvm::AttrListPtr::FunctionIndex,
+      Fn->addAttribute(llvm::AttributeSet::FunctionIndex,
                        llvm::Attributes::get(CGM.getLLVMContext(), B));
     }
   }