[llvm-commits] [llvm-gcc-4.2] r77367 - in /llvm-gcc-4.2/trunk/gcc: config/arm/llvm-arm.cpp config/rs6000/llvm-rs6000.cpp llvm-convert.cpp

[Owen Anderson]

Author: resistor
Date: Tue Jul 28 16:19:34 2009
New Revision: 77367

URL: http://llvm.org/viewvc/llvm-project?rev=77367&view=rev
Log:
Update for LLVM API change.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp
    llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp?rev=77367&r1=77366&r2=77367&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp Tue Jul 28 16:19:34 2009
@@ -151,7 +151,7 @@
     for (unsigned i = 0; i != NUnits; ++i)
       Idxs.push_back(ConstantInt::get(Type::Int32Ty, 0));
     Result = Builder.CreateShuffleVector(Result, Undef,
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
   }
   return Result;
 }
@@ -166,7 +166,7 @@
   for (unsigned i = 0; i != NUnits; ++i)
     Idxs.push_back(ConstantInt::get(Type::Int32Ty, LaneVal));
   return Builder.CreateShuffleVector(Vec, Context.getUndef(Vec->getType()),
-                                     Context.getConstantVector(Idxs));
+                                     ConstantVector::get(Idxs));
 }
 
 // NEON vector shift counts must be in the range 0..ElemBits-1 for left shifts
@@ -1714,7 +1714,7 @@
     for (unsigned i = 0; i != NUnits; ++i)
       Idxs.push_back(ConstantInt::get(Type::Int32Ty, i));
     Result = Builder.CreateShuffleVector(Ops[0], Ops[1],
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
     break;
   }
 
@@ -1727,7 +1727,7 @@
       Idxs.push_back(ConstantInt::get(Type::Int32Ty, Idx++));
     Result = Builder.CreateShuffleVector(Ops[0],
                                          Context.getUndef(Ops[0]->getType()),
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
     break;
   }
 
@@ -1790,7 +1790,7 @@
     for (unsigned i = 0; i != NUnits; ++i)
       Idxs.push_back(ConstantInt::get(Type::Int32Ty, i + ImmVal));
     Result = Builder.CreateShuffleVector(Ops[0], Ops[1],
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
     break;
   }
 
@@ -1818,7 +1818,7 @@
       }
     }
     Result = Builder.CreateShuffleVector(Ops[0], Context.getUndef(ResultType),
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
     break;
   }
 
@@ -1912,7 +1912,7 @@
       }
     }
     Result = Builder.CreateShuffleVector(Ops[1], Ops[2],
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
     Type *PtrTy = Result->getType()->getPointerTo();
     Builder.CreateStore(Result, BitCastToType(Ops[0], PtrTy));
     Result = 0;
@@ -1928,7 +1928,7 @@
       Idxs.push_back(ConstantInt::get(Type::Int32Ty, i + NUnits));
     }
     Result = Builder.CreateShuffleVector(Ops[1], Ops[2],
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
     Type *PtrTy = Result->getType()->getPointerTo();
     Builder.CreateStore(Result, BitCastToType(Ops[0], PtrTy));
     Result = 0;
@@ -1944,7 +1944,7 @@
         Idxs.push_back(ConstantInt::get(Type::Int32Ty, 2 * i + EvenOdd));
     }
     Result = Builder.CreateShuffleVector(Ops[1], Ops[2],
-                                         Context.getConstantVector(Idxs));
+                                         ConstantVector::get(Idxs));
     Type *PtrTy = Result->getType()->getPointerTo();
     Builder.CreateStore(Result, BitCastToType(Ops[0], PtrTy));
     Result = 0;
@@ -2058,7 +2058,7 @@
           Idxs.push_back(ConstantInt::get(Type::Int32Ty, n * NUnits));
       }
       Result = Builder.CreateShuffleVector(Result, Context.getUndef(VTy),
-                                           Context.getConstantVector(Idxs));
+                                           ConstantVector::get(Idxs));
     }
     Type *PtrToWideVec = Context.getPointerTypeUnqual(VTy);
     Builder.CreateStore(Result, BitCastToType(DestLoc->Ptr, PtrToWideVec));

Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp?rev=77367&r1=77366&r2=77367&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp Tue Jul 28 16:19:34 2009
@@ -301,7 +301,7 @@
     VectorType *v4i32 = Context.getVectorType(Type::Int32Ty, 4);
     Ops[0] = Builder.CreateBitCast(Ops[0], v4i32, "tmp");
     Constant *C = ConstantInt::get(Type::Int32Ty, 0x7FFFFFFF);
-    C = Context.getConstantVector(std::vector<Constant*>(4, C));
+    C = ConstantVector::get(std::vector<Constant*>(4, C));
     Result = Builder.CreateAnd(Ops[0], C, "tmp");
     Result = Builder.CreateBitCast(Result, ResultType, "tmp");
     return true;

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=77367&r1=77366&r2=77367&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Jul 28 16:19:34 2009
@@ -4616,7 +4616,7 @@
     std::vector<Constant*> CstOps;
     for (unsigned i = 0, e = Ops.size(); i != e; ++i)
       CstOps.push_back(cast<Constant>(Ops[i]));
-    return Context.getConstantVector(CstOps);
+    return ConstantVector::get(CstOps);
   }
   
   // Otherwise, insertelement the values to build the vector.
@@ -4675,7 +4675,7 @@
 
   // Turn this into the appropriate shuffle operation.
   return Builder.CreateShuffleVector(InVec1, InVec2, 
-                                     Context.getConstantVector(Idxs));
+                                     ConstantVector::get(Idxs));
 }
 
 //===----------------------------------------------------------------------===//
@@ -7062,7 +7062,7 @@
       Elts.push_back(Zero);
   }
   
-  return Context.getConstantVector(Elts);
+  return ConstantVector::get(Elts);
 }
 
 Constant *TreeConstantToLLVM::ConvertSTRING_CST(tree exp) {
@@ -7304,7 +7304,7 @@
   
   if (TREE_CODE(InitType) == VECTOR_TYPE) {
     assert(AllEltsSameType && "Vector of heterogeneous element types?");
-    return Context.getConstantVector(ResultElts);
+    return ConstantVector::get(ResultElts);
   }
   
   if (AllEltsSameType)