diff options
| -rw-r--r-- | lib/CodeGen/CGDecl.cpp | 4 | ||||
| -rw-r--r-- | lib/CodeGen/CGExprScalar.cpp | 6 | ||||
| -rw-r--r-- | test/CodeGen/variable-array.c | 14 |
3 files changed, 22 insertions, 2 deletions
diff --git a/lib/CodeGen/CGDecl.cpp b/lib/CodeGen/CGDecl.cpp index 681d8f68af..0a1d1d0bd1 100644 --- a/lib/CodeGen/CGDecl.cpp +++ b/lib/CodeGen/CGDecl.cpp @@ -122,6 +122,10 @@ void CodeGenFunction::EmitStaticBlockVarDecl(const VarDecl &D) { // circular references. DMEntry = GV; + // Make sure to evaluate VLA bounds now so that we have them for later. + if (D.getType()->isVariablyModifiedType()) + EmitVLASize(D.getType()); + if (D.getInit()) { llvm::Constant *Init = CGM.EmitConstantExpr(D.getInit(), D.getType(), this); diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 0c6e6c6854..77771bd937 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -213,7 +213,11 @@ public: return llvm::Constant::getNullValue(ConvertType(E->getType())); } Value *VisitImplicitCastExpr(const ImplicitCastExpr *E); - Value *VisitCastExpr(const CastExpr *E) { + Value *VisitCastExpr(const CastExpr *E) { + // Make sure to evaluate VLA bounds now so that we have them for later. + if (E->getType()->isVariablyModifiedType()) + CGF.EmitVLASize(E->getType()); + return EmitCastExpr(E->getSubExpr(), E->getType()); } Value *EmitCastExpr(const Expr *E, QualType T); diff --git a/test/CodeGen/variable-array.c b/test/CodeGen/variable-array.c index 280539fa89..f5621c289d 100644 --- a/test/CodeGen/variable-array.c +++ b/test/CodeGen/variable-array.c @@ -1,7 +1,19 @@ -// RUN: clang-cc -emit-llvm < %s | grep puts +// RUN: clang-cc -emit-llvm < %s | grep puts | count 4 +// PR3248 int a(int x) { int (*y)[x]; return sizeof(*(puts("asdf"),y)); } + +// PR3247 +int b() { + return sizeof(*(char(*)[puts("asdf")])0); +} + +// PR3247 +int c() { + static int (*y)[puts("asdf")]; + return sizeof(*y); +} |