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

Owen Anderson resistor at mac.com
Thu Jul 30 16:03:34 PDT 2009


Author: resistor
Date: Thu Jul 30 18:03:34 2009
New Revision: 77634

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

Modified:
    llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.cpp
    llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp
    llvm-gcc-4.2/trunk/gcc/config/rs6000/llvm-rs6000.cpp
    llvm-gcc-4.2/trunk/gcc/llvm-backend.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=77634&r1=77633&r2=77634&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 Thu Jul 30 18:03:34 2009
@@ -139,7 +139,7 @@
   }
 
   // Insert the value into lane 0 of an undef vector.
-  Value *Undef = Context.getUndef(ResultType);
+  Value *Undef = UndefValue::get(ResultType);
   Value *Result =
     Builder.CreateInsertElement(Undef, Val,
                                 ConstantInt::get(Type::Int32Ty, 0));
@@ -165,7 +165,7 @@
   LLVMContext &Context = getGlobalContext();
   for (unsigned i = 0; i != NUnits; ++i)
     Idxs.push_back(ConstantInt::get(Type::Int32Ty, LaneVal));
-  return Builder.CreateShuffleVector(Vec, Context.getUndef(Vec->getType()),
+  return Builder.CreateShuffleVector(Vec, UndefValue::get(Vec->getType()),
                                      ConstantVector::get(Idxs));
 }
 
@@ -1726,7 +1726,7 @@
     for (unsigned i = 0; i != NUnits; ++i)
       Idxs.push_back(ConstantInt::get(Type::Int32Ty, Idx++));
     Result = Builder.CreateShuffleVector(Ops[0],
-                                         Context.getUndef(Ops[0]->getType()),
+                                         UndefValue::get(Ops[0]->getType()),
                                          ConstantVector::get(Idxs));
     break;
   }
@@ -1817,7 +1817,7 @@
         Idxs.push_back(ConstantInt::get(Type::Int32Ty, c - i - 1));
       }
     }
-    Result = Builder.CreateShuffleVector(Ops[0], Context.getUndef(ResultType),
+    Result = Builder.CreateShuffleVector(Ops[0], UndefValue::get(ResultType),
                                          ConstantVector::get(Idxs));
     break;
   }
@@ -2054,7 +2054,7 @@
     default: assert(false);
     }
     unsigned NUnits = VTy->getNumElements() / NumVecs;
-    Result = Context.getUndef(VTy);
+    Result = UndefValue::get(VTy);
     for (unsigned n = 0; n != NumVecs; ++n) {
       Value *Addr = (n == 0) ? Ops[0] :
         Builder.CreateGEP(Ops[0], ConstantInt::get(Type::Int32Ty, n));
@@ -2070,7 +2070,7 @@
         for (unsigned i = 0; i != NUnits; ++i)
           Idxs.push_back(ConstantInt::get(Type::Int32Ty, n * NUnits));
       }
-      Result = Builder.CreateShuffleVector(Result, Context.getUndef(VTy),
+      Result = Builder.CreateShuffleVector(Result, UndefValue::get(VTy),
                                            ConstantVector::get(Idxs));
     }
     Type *PtrToWideVec = PointerType::getUnqual(VTy);

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/llvm-i386.cpp Thu Jul 30 18:03:34 2009
@@ -347,7 +347,7 @@
     PointerType *f64Ptr = PointerType::getUnqual(Type::DoubleTy);
     Ops[1] = Builder.CreateBitCast(Ops[1], f64Ptr, "tmp");
     Value *Load = Builder.CreateLoad(Ops[1], "tmp");
-    Ops[1] = BuildVector(Load, Context.getUndef(Type::DoubleTy), NULL);
+    Ops[1] = BuildVector(Load, UndefValue::get(Type::DoubleTy), NULL);
     Ops[1] = Builder.CreateBitCast(Ops[1], ResultType, "tmp");
     Result = BuildVectorShuffle(Ops[0], Ops[1], 0, 1, 4, 5);
     Result = Builder.CreateBitCast(Result, ResultType, "tmp");
@@ -357,7 +357,7 @@
     PointerType *f64Ptr = PointerType::getUnqual(Type::DoubleTy);
     Ops[1] = Builder.CreateBitCast(Ops[1], f64Ptr, "tmp");
     Value *Load = Builder.CreateLoad(Ops[1], "tmp");
-    Ops[1] = BuildVector(Load, Context.getUndef(Type::DoubleTy), NULL);
+    Ops[1] = BuildVector(Load, UndefValue::get(Type::DoubleTy), NULL);
     Ops[1] = Builder.CreateBitCast(Ops[1], ResultType, "tmp");
     Result = BuildVectorShuffle(Ops[0], Ops[1], 4, 5, 2, 3);
     Result = Builder.CreateBitCast(Result, ResultType, "tmp");
@@ -365,7 +365,7 @@
   }
   case IX86_BUILTIN_LOADHPD: {
     Value *Load = Builder.CreateLoad(Ops[1], "tmp");
-    Ops[1] = BuildVector(Load, Context.getUndef(Type::DoubleTy), NULL);
+    Ops[1] = BuildVector(Load, UndefValue::get(Type::DoubleTy), NULL);
     Ops[1] = Builder.CreateBitCast(Ops[1], ResultType, "tmp");
     Result = BuildVectorShuffle(Ops[0], Ops[1], 0, 2);
     Result = Builder.CreateBitCast(Result, ResultType, "tmp");
@@ -373,7 +373,7 @@
   }
   case IX86_BUILTIN_LOADLPD: {
     Value *Load = Builder.CreateLoad(Ops[1], "tmp");
-    Ops[1] = BuildVector(Load, Context.getUndef(Type::DoubleTy), NULL);
+    Ops[1] = BuildVector(Load, UndefValue::get(Type::DoubleTy), NULL);
     Ops[1] = Builder.CreateBitCast(Ops[1], ResultType, "tmp");
     Result = BuildVectorShuffle(Ops[0], Ops[1], 2, 1);
     Result = Builder.CreateBitCast(Result, ResultType, "tmp");

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=77634&r1=77633&r2=77634&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 Thu Jul 30 18:03:34 2009
@@ -182,7 +182,7 @@
                            Elt, Elt, Elt, Elt,  Elt, Elt, Elt, Elt, NULL);
     } else {
       error("%Helement must be an immediate", &EXPR_LOCATION(exp));
-      Result = Context.getUndef(VectorType::get(Type::Int8Ty, 16));
+      Result = UndefValue::get(VectorType::get(Type::Int8Ty, 16));
     }
     return true;
   case ALTIVEC_BUILTIN_VSPLTISH:
@@ -191,7 +191,7 @@
       Result = BuildVector(Elt, Elt, Elt, Elt,  Elt, Elt, Elt, Elt, NULL);
     } else {
       error("%Helement must be an immediate", &EXPR_LOCATION(exp));
-      Result = Context.getUndef(VectorType::get(Type::Int16Ty, 8));
+      Result = UndefValue::get(VectorType::get(Type::Int16Ty, 8));
     }
     return true;
   case ALTIVEC_BUILTIN_VSPLTISW:
@@ -200,7 +200,7 @@
       Result = BuildVector(Elt, Elt, Elt, Elt, NULL);
     } else {
       error("%Hmask must be an immediate", &EXPR_LOCATION(exp));
-      Result = Context.getUndef(VectorType::get(Type::Int32Ty, 4));
+      Result = UndefValue::get(VectorType::get(Type::Int32Ty, 4));
     }
     return true;
   case ALTIVEC_BUILTIN_VSPLTB:

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=77634&r1=77633&r2=77634&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Thu Jul 30 18:03:34 2009
@@ -1203,7 +1203,7 @@
   handleVisibility(decl, GV);
 
   // Temporary to avoid infinite recursion (see comments emit_global_to_llvm)
-  GV->setInitializer(Context.getUndef(GV->getType()->getElementType()));
+  GV->setInitializer(UndefValue::get(GV->getType()->getElementType()));
 
   // Convert the initializer over.
   Constant *Init = TreeConstantToLLVM::Convert(DECL_INITIAL(decl));
@@ -1283,7 +1283,7 @@
     // on it".  When constructing the initializer it might refer to itself.
     // this can happen for things like void *G = &G;
     //
-    GV->setInitializer(Context.getUndef(GV->getType()->getElementType()));
+    GV->setInitializer(UndefValue::get(GV->getType()->getElementType()));
     Init = TreeConstantToLLVM::Convert(DECL_INITIAL(decl));
   }
 

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=77634&r1=77633&r2=77634&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Thu Jul 30 18:03:34 2009
@@ -1433,7 +1433,7 @@
   
   Value *Ops[2] = {
     V,
-    Context.getConstantPointerNull(Ty)
+    ConstantPointerNull::get(Ty)
   };
   
   Builder.CreateCall(gcrootFun, Ops, Ops+2);
@@ -2364,7 +2364,7 @@
                                         unsigned RealSize,
                                         LLVMBuilder &Builder) {
   if (!RealSize)
-    return Context.getUndef(LLVMTy);
+    return UndefValue::get(LLVMTy);
 
   // Not clear what this is supposed to do on big endian machines...
   assert(!BYTES_BIG_ENDIAN && "Unsupported case - please report");
@@ -3811,7 +3811,7 @@
   // If there was an error, return something bogus.
   if (ValidateRegisterVariable(decl)) {
     if (Ty->isSingleValueType())
-      return Context.getUndef(Ty);
+      return UndefValue::get(Ty);
     return 0;   // Just don't copy something into DestLoc.
   }
 
@@ -4620,7 +4620,7 @@
   
   // Otherwise, insertelement the values to build the vector.
   Value *Result = 
-    Context.getUndef(VectorType::get(Ops[0]->getType(), Ops.size()));
+    UndefValue::get(VectorType::get(Ops[0]->getType(), Ops.size()));
   
   for (unsigned i = 0, e = Ops.size(); i != e; ++i)
     Result = Builder.CreateInsertElement(Result, Ops[i], 
@@ -4664,7 +4664,7 @@
   for (unsigned i = 0; i != NumElements; ++i) {
     int idx = va_arg(VA, int);
     if (idx == -1)
-      Idxs.push_back(Context.getUndef(Type::Int32Ty));
+      Idxs.push_back(UndefValue::get(Type::Int32Ty));
     else {
       assert((unsigned)idx < 2*NumElements && "Element index out of range!");
       Idxs.push_back(ConstantInt::get(Type::Int32Ty, idx));
@@ -4826,7 +4826,7 @@
               BuiltinName);
         const Type *ResTy = ConvertType(TREE_TYPE(exp));
         if (ResTy->isSingleValueType())
-          Result = Context.getUndef(ResTy);
+          Result = UndefValue::get(ResTy);
         return true;
       }
       
@@ -6736,7 +6736,7 @@
     if (errorcount || sorrycount) {
       const Type *Ty = ConvertType(TREE_TYPE(exp));
       const PointerType *PTy = PointerType::getUnqual(Ty);
-      LValue LV(Context.getConstantPointerNull(PTy), 1);
+      LValue LV(ConstantPointerNull::get(PTy), 1);
       return LV;
     }
     assert(0 && "INTERNAL ERROR: Referencing decl that hasn't been laid out");





More information about the llvm-commits mailing list