For PR950:

The long awaited CAST patch. This introduces 12 new instructions into LLVM
to replace the cast instruction. Corresponding changes throughout LLVM are
provided. This passes llvm-test, llvm/test, and SPEC CPUINT2000 with the
exception of 175.vpr which fails only on a slight floating point output
difference.

llvm-svn: 31931

1 files changed, 4 insertions, 4 deletions

diff --git a/llvm/lib/VMCore/AutoUpgrade.cpp b/llvm/lib/VMCore/AutoUpgrade.cpp
index 1529d1bf1f7..57a09e2d07f 100644
--- a/llvm/lib/VMCore/AutoUpgrade.cpp
+++ b/llvm/lib/VMCore/AutoUpgrade.cpp
@@ -206,8 +206,8 @@ static Value *CastArg(Value *Arg, const Type *Ty, Instruction *InsertBefore) {
   if (Constant *C = dyn_cast<Constant>(Arg)) {
     return ConstantExpr::getCast(C, Ty);
   } else {
-    Value *Cast = new CastInst(Arg, Ty, "autoupgrade_cast", InsertBefore);
-    return Cast;
+    return CastInst::createInferredCast(Arg, Ty, "autoupgrade_cast", 
+                                        InsertBefore);
   }
 }
 
@@ -261,8 +261,8 @@ void llvm::UpgradeIntrinsicCall(CallInst *CI, Function *NewFn) {
       Instruction *RetVal = NewCI;
       
       if (F->getReturnType() != NewFn->getReturnType()) {
-        RetVal = new CastInst(NewCI, F->getReturnType(), 
-                              NewCI->getName(), CI);
+        RetVal = 
+          new BitCastInst(NewCI, F->getReturnType(), NewCI->getName(), CI);
         NewCI->moveBefore(RetVal);
       }