From ad1bdc0fa1789f95a1ceb8280a8f830b9b0b68a0 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Mon, 14 Apr 2014 23:47:48 +0000 Subject: [PATCH] Ensure we evaluate VLA bounds if a variably-modified type is used as the argument to __builtin_va_arg. Patch by Rahul Jain, some test massaging and IR emission order changes by me. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@206223 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGExprScalar.cpp | 4 ++++ test/CodeGen/varargs.c | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp index 5f932b08b5..08e410be01 100644 --- a/lib/CodeGen/CGExprScalar.cpp +++ b/lib/CodeGen/CGExprScalar.cpp @@ -3199,6 +3199,10 @@ Value *ScalarExprEmitter::VisitChooseExpr(ChooseExpr *E) { } Value *ScalarExprEmitter::VisitVAArgExpr(VAArgExpr *VE) { + QualType Ty = VE->getType(); + if (Ty->isVariablyModifiedType()) + CGF.EmitVariablyModifiedType(Ty); + llvm::Value *ArgValue = CGF.EmitVAListRef(VE->getSubExpr()); llvm::Value *ArgPtr = CGF.EmitVAArg(ArgValue, VE->getType()); diff --git a/test/CodeGen/varargs.c b/test/CodeGen/varargs.c index b6973d8337..3e2cce0793 100644 --- a/test/CodeGen/varargs.c +++ b/test/CodeGen/varargs.c @@ -1,5 +1,4 @@ -// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s - +// RUN: %clang_cc1 -triple i386-unknown-unknown -emit-llvm -o - %s | FileCheck %s // PR6433 - Don't crash on va_arg(typedef). typedef double gdouble; @@ -15,3 +14,10 @@ void function_as_vararg() { // CHECK-NOT: llvm.trap vararg(0, focus_changed_cb); } + +void vla(int n, ...) +{ + __builtin_va_list ap; + void *p; + p = __builtin_va_arg(ap, typeof (int (*)[++n])); // CHECK: add nsw i32 {{.*}}, 1 +} -- 2.40.0