diff options
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 7 | ||||
| -rw-r--r-- | test/CodeGen/vla.c | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 4984d0df35..d829facb16 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -663,8 +663,13 @@ ScalarExprEmitter::VisitSizeOfAlignOfExpr(const SizeOfAlignOfExpr *E) { if (const VariableArrayType *VAT = CGF.getContext().getAsVariableArrayType(TypeToSize)) { - if (E->isSizeOf()) + if (E->isSizeOf()) { + if (E->isArgumentType()) { + // sizeof(type) - make sure to emit the VLA size. + CGF.EmitVLASize(TypeToSize); + } return CGF.GetVLASize(VAT); + } // FIXME: This should be an UNSUPPORTED error. assert(0 && "alignof VLAs not implemented yet"); } diff --git a/test/CodeGen/vla.c b/test/CodeGen/vla.c index a584020abc..0881520c75 100644 --- a/test/CodeGen/vla.c +++ b/test/CodeGen/vla.c @@ -8,3 +8,8 @@ void a(int x) { arry[0] = 10; b(arry); } + +void b(int n) +{ + sizeof(int[n]); +} |