[llvm-commits] [poolalloc] r165624 - in /poolalloc/trunk/lib: AssistDS/GEPExprArgs.cpp AssistDS/LoadArgs.cpp AssistDS/StructReturnToPointer.cpp AssistDS/TypeChecks.cpp DSA/DSGraph.cpp PoolAllocate/PoolAllocate.cpp

[John Criswell]

Author: criswell
Date: Wed Oct 10 11:17:45 2012
New Revision: 165624

URL: http://llvm.org/viewvc/llvm-project?rev=165624&view=rev
Log:
Fix for attribute changes.

Modified:
    poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp
    poolalloc/trunk/lib/AssistDS/LoadArgs.cpp
    poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp
    poolalloc/trunk/lib/AssistDS/TypeChecks.cpp
    poolalloc/trunk/lib/DSA/DSGraph.cpp
    poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp

Modified: poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/GEPExprArgs.cpp Wed Oct 10 11:17:45 2012
@@ -170,7 +170,7 @@
               AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
           }
           // Create the new attributes vec.
-          if (FnAttrs != Attribute::None)
+          if (FnAttrs.hasAttributes())
             AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
 
           AttrListPtr NewCallPAL = AttrListPtr::get(AttributesVec);

Modified: poolalloc/trunk/lib/AssistDS/LoadArgs.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/LoadArgs.cpp?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/LoadArgs.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/LoadArgs.cpp Wed Oct 10 11:17:45 2012
@@ -197,7 +197,7 @@
               AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
           }
           // Create the new attributes vec.
-          if (FnAttrs != Attribute::None)
+          if (FnAttrs.hasAttributes())
             AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
 
           AttrListPtr NewCallPAL = AttrListPtr::get(AttributesVec);

Modified: poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/StructReturnToPointer.cpp Wed Oct 10 11:17:45 2012
@@ -138,7 +138,7 @@
           AttributesVec.push_back(AttributeWithIndex::get(Args.size(), Attrs));
       }
       // Create the new attributes vec.
-      if (FnAttrs != Attribute::None)
+      if (FnAttrs.hasAttributes())
         AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
 
       AttrListPtr NewCallPAL = AttrListPtr::get(AttributesVec);

Modified: poolalloc/trunk/lib/AssistDS/TypeChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/AssistDS/TypeChecks.cpp?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
--- poolalloc/trunk/lib/AssistDS/TypeChecks.cpp (original)
+++ poolalloc/trunk/lib/AssistDS/TypeChecks.cpp Wed Oct 10 11:17:45 2012
@@ -1082,7 +1082,7 @@
         }
 
         // Create the new attributes vec.
-        if (FnAttrs != Attribute::None)
+        if (FnAttrs.hasAttributes())
           AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
 
         AttrListPtr NewCallPAL = AttrListPtr::get(AttributesVec);
@@ -1129,7 +1129,7 @@
         }
 
         // Create the new attributes vec.
-        if (FnAttrs != Attribute::None)
+        if (FnAttrs.hasAttributes())
           AttributesVec.push_back(AttributeWithIndex::get(~0, FnAttrs));
 
         AttrListPtr NewCallPAL = AttrListPtr::get(AttributesVec);
@@ -1156,7 +1156,7 @@
   for (Function::arg_iterator I = F.arg_begin(); I != F.arg_end(); ++I) {
     if (!I->hasByValAttr())
       continue;
-    I->removeAttr(llvm::Attribute::ByVal);
+    I->removeAttr(Attributes(Attributes::ByVal));
   }
   return true;
 }

Modified: poolalloc/trunk/lib/DSA/DSGraph.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSGraph.cpp?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DSGraph.cpp (original)
+++ poolalloc/trunk/lib/DSA/DSGraph.cpp Wed Oct 10 11:17:45 2012
@@ -1498,7 +1498,7 @@
     Function::const_arg_iterator farg = F->arg_begin(), fend = F->arg_end();
     for (unsigned index = 1; index < (CS.arg_size() + 1) && farg != fend;
         ++farg, ++index) {
-      if (CS.paramHasByValAttr(index) != farg->hasByValAttr()) {
+      if (CS.isByValArgument(index) != farg->hasByValAttr()) {
         return false;
       }
     }

Modified: poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp?rev=165624&r1=165623&r2=165624&view=diff
==============================================================================
--- poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp (original)
+++ poolalloc/trunk/lib/PoolAllocate/PoolAllocate.cpp Wed Oct 10 11:17:45 2012
@@ -997,7 +997,7 @@
   Function::ArgumentListType & ArgList = New->getArgumentList ();
   Function::ArgumentListType::iterator arg = ArgList.begin();
   for (; arg != ArgList.end(); ++arg) {
-    arg->removeAttr (Attribute::StructRet);
+    arg->removeAttr (Attributes(Attributes::StructRet));
   }
 
   //