[llvm-commits] [dragonegg] r169658 - in /dragonegg/trunk/src: Backend.cpp Convert.cpp TypeConversion.cpp

[Bill Wendling]

Author: void
Date: Fri Dec  7 18:34:32 2012
New Revision: 169658

URL: http://llvm.org/viewvc/llvm-project?rev=169658&view=rev
Log:
Change AttrListPtr to AttributeSet.

Modified:
    dragonegg/trunk/src/Backend.cpp
    dragonegg/trunk/src/Convert.cpp
    dragonegg/trunk/src/TypeConversion.cpp

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=169658&r1=169657&r2=169658&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Fri Dec  7 18:34:32 2012
@@ -1300,7 +1300,7 @@
     Function *FnEntry = TheModule->getFunction(Name);
     if (FnEntry == 0) {
       CallingConv::ID CC;
-      AttrListPtr PAL;
+      AttributeSet PAL;
       FunctionType *Ty = ConvertFunctionType(TREE_TYPE(decl), decl, NULL, CC,
                                              PAL);
       FnEntry = Function::Create(Ty, Function::ExternalLinkage, Name, TheModule);

Modified: dragonegg/trunk/src/Convert.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Convert.cpp?rev=169658&r1=169657&r2=169658&view=diff
==============================================================================
--- dragonegg/trunk/src/Convert.cpp (original)
+++ dragonegg/trunk/src/Convert.cpp Fri Dec  7 18:34:32 2012
@@ -915,7 +915,7 @@
   tree static_chain = cfun->static_chain_decl;
   FunctionType *FTy;
   CallingConv::ID CallingConv;
-  AttrListPtr PAL;
+  AttributeSet PAL;
 
   // If this is a K&R-style function: with a type that takes no arguments but
   // with arguments none the less, then calculate the LLVM type from the list
@@ -3260,11 +3260,11 @@
 /// in the GIMPLE_CALL 'stmt'. If the result of the call is a scalar, return the
 /// result, otherwise store it in DestLoc.
 Value *TreeToLLVM::EmitCallOf(Value *Callee, gimple stmt, const MemRef *DestLoc,
-                              const AttrListPtr &InPAL) {
+                              const AttributeSet &InPAL) {
   BasicBlock *LandingPad = 0; // Non-zero indicates an invoke.
   int LPadNo = 0;
 
-  AttrListPtr PAL = InPAL;
+  AttributeSet PAL = InPAL;
   if (PAL.isEmpty() && isa<Function>(Callee))
     PAL = cast<Function>(Callee)->getAttributes();
 
@@ -4265,7 +4265,7 @@
     }
 
     Result = EmitCallOf(TargetBuiltinCache[FnCode], stmt, DestLoc,
-                        AttrListPtr());
+                        AttributeSet());
     return true;
   }
 
@@ -8986,7 +8986,7 @@
   tree function_type = TREE_TYPE(TREE_TYPE (call_expr));
   Value *Callee = EmitRegister(call_expr);
   CallingConv::ID CallingConv;
-  AttrListPtr PAL;
+  AttributeSet PAL;
 
   Type *Ty;
   // If this is a K&R-style function: with a type that takes no arguments but

Modified: dragonegg/trunk/src/TypeConversion.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/TypeConversion.cpp?rev=169658&r1=169657&r2=169658&view=diff
==============================================================================
--- dragonegg/trunk/src/TypeConversion.cpp (original)
+++ dragonegg/trunk/src/TypeConversion.cpp Fri Dec  7 18:34:32 2012
@@ -659,7 +659,7 @@
 FunctionType *ConvertArgListToFnType(tree type, ArrayRef<tree> Args,
                                      tree static_chain, bool KNRPromotion,
                                      CallingConv::ID &CallingConv,
-                                     AttrListPtr &PAL) {
+                                     AttributeSet &PAL) {
   tree ReturnType = TREE_TYPE(type);
   SmallVector<Type*, 8> ArgTys;
   Type *RetTy(Type::getVoidTy(Context));
@@ -730,13 +730,13 @@
                                                               PAttrBuilder)));
   }
 
-  PAL = AttrListPtr::get(Context, Attrs);
+  PAL = AttributeSet::get(Context, Attrs);
   return FunctionType::get(RetTy, ArgTys, false);
 }
 
 FunctionType *ConvertFunctionType(tree type, tree decl, tree static_chain,
                                   CallingConv::ID &CallingConv,
-                                  AttrListPtr &PAL) {
+                                  AttributeSet &PAL) {
   Type *RetTy = Type::getVoidTy(Context);
   SmallVector<Type*, 8> ArgTypes;
   FunctionTypeConversion Client(RetTy, ArgTypes, CallingConv, false/*not K&R*/);
@@ -916,7 +916,7 @@
                                                             FnAttrBuilder)));
 
   // Finally, make the function type and result attributes.
-  PAL = AttrListPtr::get(Context, Attrs);
+  PAL = AttributeSet::get(Context, Attrs);
   return FunctionType::get(RetTy, ArgTypes, Args == 0);
 }
 
@@ -1358,7 +1358,7 @@
   case FUNCTION_TYPE:
   case METHOD_TYPE: {
     CallingConv::ID CallingConv;
-    AttrListPtr PAL;
+    AttributeSet PAL;
     // No declaration to pass through, passing NULL.
     return RememberTypeConversion(type, ConvertFunctionType(type, NULL, NULL,
                                                             CallingConv, PAL));