diff options
-rw-r--r-- | clang/lib/CodeGen/CGDebugInfo.cpp | 5 | ||||
-rw-r--r-- | clang/test/CodeGenCXX/debug-info-vla.cpp | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index fa5f53e4599..a153193a53f 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -2122,6 +2122,11 @@ llvm::DIType *CGDebugInfo::CreateType(const ArrayType *Ty, llvm::DIFile *Unit) { int64_t Count = -1; // Count == -1 is an unbounded array. if (const auto *CAT = dyn_cast<ConstantArrayType>(Ty)) Count = CAT->getSize().getZExtValue(); + else if (const auto *VAT = dyn_cast<VariableArrayType>(Ty)) { + llvm::APSInt V; + if (VAT->getSizeExpr()->EvaluateAsInt(V, CGM.getContext())) + Count = V.getExtValue(); + } // FIXME: Verify this is right for VLAs. Subscripts.push_back(DBuilder.getOrCreateSubrange(0, Count)); diff --git a/clang/test/CodeGenCXX/debug-info-vla.cpp b/clang/test/CodeGenCXX/debug-info-vla.cpp new file mode 100644 index 00000000000..024ee3a6f9a --- /dev/null +++ b/clang/test/CodeGenCXX/debug-info-vla.cpp @@ -0,0 +1,14 @@ +// RUN: %clang -target x86_64-unknown-unknown -fverbose-asm -g -O0 -S -emit-llvm %s -o - | FileCheck %s + + +void f(int m) { + int x[3][m]; +} + +// CHECK: !DICompositeType(tag: DW_TAG_array_type, +// CHECK-NOT: size: +// CHECK-SAME: align: 32 +// CHECK-SAME: elements: [[ELEM_TYPE:![0-9]+]] +// CHECK: [[ELEM_TYPE]] = !{[[SUB1:.*]], [[SUB2:.*]]} +// CHECK: [[SUB1]] = !DISubrange(count: 3) +// CHECK: [[SUB2]] = !DISubrange(count: -1) |