Get the size of auto arrays right, regardless of its changing size.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37006 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 13 insertions, 11 deletions

diff --git a/lib/CodeGen/IntrinsicLowering.cpp b/lib/CodeGen/IntrinsicLowering.cpp
index 72c0f3b084..12d392c09f 100644
--- a/lib/CodeGen/IntrinsicLowering.cpp
+++ b/lib/CodeGen/IntrinsicLowering.cpp
@@ -403,11 +403,12 @@ static Instruction *LowerPartSelect(CallInst *CI) {
   }
 
   // Return a call to the implementation function
-  Value *Args[3];
-  Args[0] = CI->getOperand(1);
-  Args[1] = CI->getOperand(2);
-  Args[2] = CI->getOperand(3);
-  return new CallInst(F, Args, 3, CI->getName(), CI);
+  Value *Args[] = {
+    CI->getOperand(1),
+    CI->getOperand(2),
+    CI->getOperand(3)
+  };
+  return new CallInst(F, Args, sizeof(Args)/sizeof(Args[0]), CI->getName(), CI);
 }
 
 /// Convert the llvm.part.set.iX.iY.iZ intrinsic. This intrinsic takes 
@@ -591,12 +592,13 @@ static Instruction *LowerPartSet(CallInst *CI) {
   }
 
   // Return a call to the implementation function
-  Value *Args[3];
-  Args[0] = CI->getOperand(1);
-  Args[1] = CI->getOperand(2);
-  Args[2] = CI->getOperand(3);
-  Args[3] = CI->getOperand(4);
-  return new CallInst(F, Args, 4, CI->getName(), CI);
+  Value *Args[] = {
+    CI->getOperand(1),
+    CI->getOperand(2),
+    CI->getOperand(3),
+    CI->getOperand(4)
+  };
+  return new CallInst(F, Args, sizeof(Args)/sizeof(Args[0]), CI->getName(), CI);
 }