diff options
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 3 | ||||
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenFunction.cpp | 11 |
3 files changed, 10 insertions, 8 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 898c1bfd80..73d3e2103c 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -197,6 +197,9 @@ void CodeGenFunction::EmitLocalBlockVarDecl(const VarDecl &D) { llvm::Value *VLASize = EmitVLASize(Ty); + // Downcast the VLA size expression + VLASize = Builder.CreateIntCast(VLASize, llvm::Type::Int32Ty, false, "tmp"); + // Allocate memory for the array. llvm::Value *VLA = Builder.CreateAlloca(llvm::Type::Int8Ty, VLASize, "vla"); DeclPtr = Builder.CreateBitCast(VLA, LElemPtrTy, "tmp"); diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 44eefea71d..b9dcc078d4 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -685,9 +685,7 @@ ScalarExprEmitter::VisitSizeOfAlignOfExpr(const SizeOfAlignOfExpr *E) { CGF.EmitVLASize(TypeToSize); } - llvm::Value *VLASize = CGF.GetVLASize(VAT); - return Builder.CreateIntCast(VLASize, ConvertType(E->getType()), - false, "conv"); + return CGF.GetVLASize(VAT); } } diff --git a/lib/CodeGen/CodeGenFunction.cpp b/lib/CodeGen/CodeGenFunction.cpp index 58559e5249..2b365c9cca 100644 --- a/lib/CodeGen/CodeGenFunction.cpp +++ b/lib/CodeGen/CodeGenFunction.cpp @@ -480,18 +480,19 @@ llvm::Value *CodeGenFunction::EmitVLASize(QualType Ty) llvm::Value *ElemSize; QualType ElemTy = VAT->getElementType(); - + + const llvm::Type *SizeTy = ConvertType(getContext().getSizeType()); + if (ElemTy->isVariableArrayType()) ElemSize = EmitVLASize(ElemTy); else { - // FIXME: We use Int32Ty here because the alloca instruction takes a - // 32-bit integer. What should we do about overflow? - ElemSize = llvm::ConstantInt::get(llvm::Type::Int32Ty, + ElemSize = llvm::ConstantInt::get(SizeTy, getContext().getTypeSize(ElemTy) / 8); } llvm::Value *NumElements = EmitScalarExpr(VAT->getSizeExpr()); - + NumElements = Builder.CreateIntCast(NumElements, SizeTy, false, "tmp"); + SizeEntry = Builder.CreateMul(ElemSize, NumElements); } |