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

Benjamin Kramer benny.kra at googlemail.com
Thu Jul 14 11:02:32 PDT 2011


Author: d0k
Date: Thu Jul 14 13:02:32 2011
New Revision: 135159

URL: http://llvm.org/viewvc/llvm-project?rev=135159&view=rev
Log:
Be nice to the dead compiler and patch it for r135154.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/arm/llvm-arm.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=135159&r1=135158&r2=135159&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 14 13:02:32 2011
@@ -823,7 +823,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -835,7 +835,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -848,7 +848,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -869,7 +869,7 @@
     }
     if (datatype == neon_datatype_polynomial) {
       intID = Intrinsic::arm_neon_vmulp;
-      intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+      intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
       Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     } else if (datatype == neon_datatype_float)
       Result = Builder.CreateFMul(Ops[0], Ops[1]);
@@ -936,7 +936,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[1], Ops[2]);
     Result = Builder.CreateAdd(Ops[0], Result);
     break;
@@ -960,7 +960,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[1], Ops[2]);
     Result = Builder.CreateSub(Ops[0], Result);
     break;
@@ -984,7 +984,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1005,7 +1005,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall3(intFn, Ops[0], Ops[1], Ops[2]);
     break;
 
@@ -1026,7 +1026,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall3(intFn, Ops[0], Ops[1], Ops[2]);
     break;
 
@@ -1051,7 +1051,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1072,7 +1072,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1113,7 +1113,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1129,7 +1129,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1150,7 +1150,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1161,7 +1161,7 @@
     if (datatype != neon_datatype_signed)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vqshiftsu;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1180,7 +1180,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1195,7 +1195,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1210,7 +1210,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1237,7 +1237,7 @@
       else
         return BadImmediateError(exp, Result);
 
-      intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+      intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
       Result = Builder.CreateCall2(intFn, Ops[1], Ops[2]);
     }
     Result = Builder.CreateAdd(Ops[0], Result);
@@ -1284,7 +1284,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1296,7 +1296,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1309,7 +1309,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1401,7 +1401,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1416,7 +1416,7 @@
     const VectorType *VTy = dyn_cast<const VectorType>(ResultType);
     assert(VTy && "expected a vector type for vabdl result");
     llvm::Type *DTy = VectorType::getTruncatedElementVectorType(VTy);
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &DTy, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, DTy);
     Ops[0] = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     Result = Builder.CreateZExt(Ops[0], ResultType);
     break;
@@ -1430,7 +1430,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Ops[1] = Builder.CreateCall2(intFn, Ops[1], Ops[2]);
     Result = Builder.CreateAdd(Ops[0], Ops[1]);
     break;
@@ -1446,7 +1446,7 @@
     const VectorType *VTy = dyn_cast<const VectorType>(ResultType);
     assert(VTy && "expected a vector type for vabal result");
     llvm::Type *DTy = VectorType::getTruncatedElementVectorType(VTy);
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &DTy, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, DTy);
     Ops[1] = Builder.CreateCall2(intFn, Ops[1], Ops[2]);
     Ops[1] = Builder.CreateZExt(Ops[1], ResultType);
     Result = Builder.CreateAdd(Ops[0], Ops[1]);
@@ -1462,7 +1462,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1475,7 +1475,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1487,7 +1487,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1501,7 +1501,7 @@
 
     intOpTypes[0] = ResultType;
     intOpTypes[1] = Ops[0]->getType();
-    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes, 2);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1515,7 +1515,7 @@
 
     intOpTypes[0] = ResultType;
     intOpTypes[1] = Ops[1]->getType();
-    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes, 2);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes2);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1528,7 +1528,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1541,7 +1541,7 @@
     else
       return BadImmediateError(exp, Result);
 
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1549,7 +1549,7 @@
     if (datatype != neon_datatype_float)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vrecps;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1557,7 +1557,7 @@
     if (datatype != neon_datatype_float)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vrsqrts;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
 
@@ -1566,7 +1566,7 @@
                                CheckRightShiftCount, true))
       return UnexpectedError("%Hinvalid shift count", exp, Result);
     intID = Intrinsic::arm_neon_vshiftins;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall3(intFn, Ops[0], Ops[1], Ops[2]);
     break;
 
@@ -1575,7 +1575,7 @@
                                CheckLeftShiftCount, false))
       return UnexpectedError("%Hinvalid shift count", exp, Result);
     intID = Intrinsic::arm_neon_vshiftins;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall3(intFn, Ops[0], Ops[1], Ops[2]);
     break;
 
@@ -1585,7 +1585,7 @@
       intID = Intrinsic::arm_neon_vabs;
     else
       return BadImmediateError(exp, Result);
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1593,7 +1593,7 @@
     if (datatype != neon_datatype_signed)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vqabs;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1611,7 +1611,7 @@
     if (datatype != neon_datatype_signed)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vqneg;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1619,7 +1619,7 @@
     if (datatype != neon_datatype_signed)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vcls;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1628,7 +1628,7 @@
         datatype != neon_datatype_unsigned)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vclz;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1636,7 +1636,7 @@
     if (datatype == neon_datatype_float)
       return BadImmediateError(exp, Result);
     intID = Intrinsic::arm_neon_vcnt;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1646,7 +1646,7 @@
       intID = Intrinsic::arm_neon_vrecpe;
     else
       return BadImmediateError(exp, Result);
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1656,7 +1656,7 @@
       intID = Intrinsic::arm_neon_vrsqrte;
     else
       return BadImmediateError(exp, Result);
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1744,7 +1744,7 @@
       intID = Intrinsic::arm_neon_vqmovnu;
     else
       return BadImmediateError(exp, Result);
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1753,7 +1753,7 @@
       intID = Intrinsic::arm_neon_vqmovnsu;
     else
       return BadImmediateError(exp, Result);
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Result = Builder.CreateCall(intFn, Ops[0]);
     break;
 
@@ -1859,7 +1859,7 @@
     }
     intOpTypes[0] = ResultType;
     intOpTypes[1] = Ops[0]->getType();
-    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes, 2);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes);
     Result = Builder.CreateCall2(intFn, Ops[0], Ops[1]);
     break;
   }
@@ -2020,7 +2020,7 @@
 
   case NEON_BUILTIN_vld1: {
     intID = Intrinsic::arm_neon_vld1;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &ResultType, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, ResultType);
     Type *VPTy = PointerType::getUnqual(Type::getInt8Ty(Context));
     unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
     Result = Builder.CreateCall2(intFn, BitCastToType(Ops[0], VPTy),
@@ -2040,7 +2040,7 @@
     case NEON_BUILTIN_vld4: intID = Intrinsic::arm_neon_vld4; break;
     default: assert(false);
     }
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &VTy, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, VTy);
     Type *VPTy = PointerType::getUnqual(Type::getInt8Ty(Context));
     unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
     Result = Builder.CreateCall2(intFn, BitCastToType(Ops[0], VPTy),
@@ -2075,7 +2075,7 @@
     default: assert(false);
     }
     intOpTypes[0] = VTy;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes);
     unsigned NumVecs = 0;
     switch (neon_code) {
     case NEON_BUILTIN_vld2_lane: NumVecs = 2; break;
@@ -2119,7 +2119,7 @@
       case NEON_BUILTIN_vld4_dup: intID = Intrinsic::arm_neon_vld4; break;
       default: assert(false);
       }
-      intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes, 1);
+      intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes);
       Type *VPTy = PointerType::getUnqual(Type::getInt8Ty(Context));
       unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
       Result = Builder.CreateCall2(intFn, BitCastToType(Ops[0], VPTy),
@@ -2136,7 +2136,7 @@
     case NEON_BUILTIN_vld4_dup: intID = Intrinsic::arm_neon_vld4lane; break;
     default: assert(false);
     }
-    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes);
     unsigned NumVecs = 0;
     switch (neon_code) {
     case NEON_BUILTIN_vld2_dup: NumVecs = 2; break;
@@ -2170,7 +2170,7 @@
   case NEON_BUILTIN_vst1: {
     Type *VTy = Ops[1]->getType();
     intID = Intrinsic::arm_neon_vst1;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &VTy, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, VTy);
     Type *VPTy = PointerType::getUnqual(Type::getInt8Ty(Context));
     unsigned Align = getPointerAlignment(TREE_VALUE(TREE_OPERAND(exp, 1)));
     Builder.CreateCall3(intFn, BitCastToType(Ops[0], VPTy), Ops[1],
@@ -2191,7 +2191,7 @@
     case NEON_BUILTIN_vst4: intID = Intrinsic::arm_neon_vst4; break;
     default: assert(false);
     }
-    intFn = Intrinsic::getDeclaration(TheModule, intID, &VTy, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, VTy);
     unsigned NumVecs = 0;
     switch (neon_code) {
     case NEON_BUILTIN_vst2: NumVecs = 2; break;
@@ -2237,7 +2237,7 @@
     default: assert(false);
     }
     intOpTypes[0] = VTy;
-    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes, 1);
+    intFn = Intrinsic::getDeclaration(TheModule, intID, intOpTypes);
     unsigned NumVecs = 0;
     switch (neon_code) {
     case NEON_BUILTIN_vst2_lane: NumVecs = 2; break;

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=135159&r1=135158&r2=135159&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Thu Jul 14 13:02:32 2011
@@ -395,7 +395,7 @@
         Type *ArgTypes[3] = {SBP, SBP, IntPtr };
         Builder.CreateCall(Intrinsic::getDeclaration(TheModule, 
                                                      Intrinsic::memcpy,
-                                                     ArgTypes, 3), Ops, Ops+5);
+                                                     ArgTypes), Ops, Ops+5);
 
         AI->setName(NameStack.back());
       }
@@ -1667,7 +1667,7 @@
 
   Type *ArgTypes[3] = {SBP, SBP, IntPtr };
   Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memcpy,
-                                               ArgTypes, 3), Ops, Ops+5);
+                                               ArgTypes), Ops, Ops+5);
   return Ops[0];
 }
 
@@ -1685,7 +1685,7 @@
   Type *ArgTypes[3] = {SBP, SBP, IntPtr };
 
   Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memmove,
-                                               ArgTypes, 3), Ops, Ops+5);
+                                               ArgTypes), Ops, Ops+5);
   return Ops[0];
 }
 
@@ -1703,7 +1703,7 @@
 
   Type *ArgTypes[2] = {SBP, IntPtr };
   Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Intrinsic::memset,
-                                               ArgTypes, 2), Ops, Ops+5);
+                                               ArgTypes), Ops, Ops+5);
   return Ops[0];
 }
 
@@ -5370,9 +5370,7 @@
 #endif
 
   Value *Result =
-    Builder.CreateCall(Intrinsic::getDeclaration(TheModule,  id,
-                                                 Ty, 2),
-    C, C + 2);
+    Builder.CreateCall(Intrinsic::getDeclaration(TheModule, id, Ty), C, C + 2);
 
   // The gcc builtins are also full memory barriers.
   // FIXME: __sync_lock_test_and_set and __sync_lock_release require less.
@@ -5415,7 +5413,7 @@
   Value *Result =
     Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                  Intrinsic::atomic_cmp_swap,
-                                                 Ty, 2),
+                                                 Ty),
     C, C + 3);
 
   // The gcc builtins are also full memory barriers.
@@ -5578,8 +5576,7 @@
 
     Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                           Intrinsic::objectsize,
-                                                          &Ty,
-                                                          1),
+                                                          Ty),
                                 Args, Args + 2);
     return true;
   }
@@ -5776,8 +5773,7 @@
     assert(Ty && "llvm.annotation arg type may not be null");
     Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                           Intrinsic::annotation,
-                                                          &Ty,
-                                                          1),
+                                                          Ty),
                                 Args.begin(), Args.end());
     return true;
   }
@@ -5948,7 +5944,7 @@
     Result =
       Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                    Intrinsic::atomic_load_add,
-                                                   Ty, 2),
+                                                   Ty),
                          C, C + 2);
 
     // The gcc builtins are also full memory barriers.
@@ -5995,7 +5991,7 @@
     Result =
       Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                    Intrinsic::atomic_load_sub,
-                                                   Ty, 2),
+                                                   Ty),
                          C, C + 2);
 
     // The gcc builtins are also full memory barriers.
@@ -6042,7 +6038,7 @@
     Result =
       Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                    Intrinsic::atomic_load_or,
-                                                   Ty, 2),
+                                                   Ty),
                          C, C + 2);
 
     // The gcc builtins are also full memory barriers.
@@ -6089,7 +6085,7 @@
     Result =
       Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                    Intrinsic::atomic_load_and,
-                                                   Ty, 2),
+                                                   Ty),
                          C, C + 2);
 
     // The gcc builtins are also full memory barriers.
@@ -6136,7 +6132,7 @@
     Result =
       Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                    Intrinsic::atomic_load_xor,
-                                                   Ty, 2),
+                                                   Ty),
                          C, C + 2);
 
     // The gcc builtins are also full memory barriers.
@@ -6183,7 +6179,7 @@
     Result =
       Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
                                                    Intrinsic::atomic_load_nand,
-                                                   Ty, 2),
+                                                   Ty),
                          C, C + 2);
 
     // The gcc builtins are also full memory barriers.
@@ -6291,7 +6287,7 @@
   // by passing it as the 3rd and 4th parameters. This isn't needed for
   // most intrinsics, but is needed for ctpop, cttz, ctlz.
   Type *Ty = InVal->getType();
-  Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Id, &Ty, 1),
+  Result = Builder.CreateCall(Intrinsic::getDeclaration(TheModule, Id, Ty),
                               InVal);
   return true;
 }
@@ -6301,7 +6297,7 @@
   Type* Ty = Amt->getType();
 
   return Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
-                                                      Intrinsic::sqrt, &Ty, 1),
+                                                      Intrinsic::sqrt, Ty),
                             Amt);
 }
 
@@ -6319,7 +6315,7 @@
   Args.push_back(Val);
   Args.push_back(Pow);
   return Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
-                                                      Intrinsic::powi, &Ty, 1),
+                                                      Intrinsic::powi, Ty),
                             Args.begin(), Args.end());
 }
 
@@ -6336,7 +6332,7 @@
   Args.push_back(Val);
   Args.push_back(Pow);
   return Builder.CreateCall(Intrinsic::getDeclaration(TheModule,
-                                                      Intrinsic::pow, &Ty, 1),
+                                                      Intrinsic::pow, Ty),
                             Args.begin(), Args.end());
 }
 
@@ -7080,7 +7076,7 @@
 
   Function *Fn = Intrinsic::getDeclaration(TheModule,
                                            Intrinsic::ptr_annotation,
-                                           &SBP, 1);
+                                           SBP);
 
   // Get file and line number.  FIXME: Should this be for the decl or the
   // use.  Is there a location info for the use?





More information about the llvm-commits mailing list