aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2009-01-30 16:41:04 +0000
committerAnders Carlsson <andersca@mac.com>2009-01-30 16:41:04 +0000
commit6cd586d2668653501ecd73d53e81cbc76db3a18c (patch)
tree8fbc90effefdd9a35817dccb2809d959f97b06d8 /lib
parentf64ef62699ae470437d3689888cb284fd31e9bd9 (diff)
Make sure to cast the VLA size of array to the type of size_t. Fixes PR3442.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@63394 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/CodeGen/CGExprScalar.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 1d389b6049..44eefea71d 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -684,7 +684,10 @@ ScalarExprEmitter::VisitSizeOfAlignOfExpr(const SizeOfAlignOfExpr *E) {
// sizeof(type) - make sure to emit the VLA size.
CGF.EmitVLASize(TypeToSize);
}
- return CGF.GetVLASize(VAT);
+
+ llvm::Value *VLASize = CGF.GetVLASize(VAT);
+ return Builder.CreateIntCast(VLASize, ConvertType(E->getType()),
+ false, "conv");
}
}