[clang] [clang][DebugInfo][test] Add tests for lambda capture packs (PR #160705)

Michael Buch via cfe-commits cfe-commits at lists.llvm.org
Thu Sep 25 23:48:11 PDT 2025


https://github.com/Michael137 updated https://github.com/llvm/llvm-project/pull/160705

>From 12caa331a8c47f9cd0289d8c0301fb539c2a3585 Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuch12 at gmail.com>
Date: Thu, 25 Sep 2025 13:32:38 +0100
Subject: [PATCH 1/3] [clang][DebugInfo][test] Add tests for lambda capture
 packs

We didn't have coverage for this yet. And I'm planning on making some
chnges in this area. These tests will be useful for that.
---
 .../DebugInfo/CXX/lambda-capture-packs.cpp    | 165 ++++++++++++++++++
 1 file changed, 165 insertions(+)
 create mode 100644 clang/test/DebugInfo/CXX/lambda-capture-packs.cpp

diff --git a/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp b/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
new file mode 100644
index 0000000000000..d5fd442ff2936
--- /dev/null
+++ b/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
@@ -0,0 +1,165 @@
+// RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm \
+// RUN:   -debug-info-kind=standalone -std=c++26 %s -o - | FileCheck %s
+
+
+// CHECK: ![[PACK1:[0-9]+]] = distinct !DISubprogram(name: "capture_pack<int>"
+// CHECK: ![[PACK2:[0-9]+]] = distinct !DISubprogram(name: "capture_pack<int, int>"
+// CHECK: ![[PACK3:[0-9]+]] = distinct !DISubprogram(name: "capture_pack_and_locals<int>"
+// CHECK: ![[PACK4:[0-9]+]] = distinct !DISubprogram(name: "capture_pack_and_locals<int, int>"
+// CHECK: ![[PACK5:[0-9]+]] = distinct !DISubprogram(name: "capture_pack_and_this<int>"
+// CHECK: ![[PACK6:[0-9]+]] = distinct !DISubprogram(name: "capture_pack_and_this<int, int>"
+
+template<typename... Args>
+auto capture_pack(Args... args) {
+  return [args..., ...params = args] {
+    return 0;
+  }();
+}
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK1]]
+// CHECK-SAME:                           elements: ![[PACK1_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK1_ELEMS]] = !{![[PACK1_ARGS:[0-9]+]], ![[PACK1_PARAMS:[0-9]+]]}
+// CHECK-NEXT: ![[PACK1_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK1_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NOT:  DW_TAG_member
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK2]]
+// CHECK-SAME:                           elements: ![[PACK2_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK2_ELEMS]] = !{![[PACK2_ARGS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK2_ARGS]]
+// CHECK-SAME:                      ![[PACK2_PARAMS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK2_PARAMS]]}
+// CHECK-NEXT: ![[PACK2_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK2_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NOT:  DW_TAG_member
+
+template<typename... Args>
+auto capture_pack_and_locals(int x, Args... args) {
+  int w = 0;
+  return [=, &args..., &x, ...params = args] {
+    return w;
+  }();
+}
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK3]]
+// CHECK-SAME:                           elements: ![[PACK3_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK3_ELEMS]] = !{![[PACK3_ARGS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK3_X:[0-9]+]]
+// CHECK-SAME:                      ![[PACK3_PARAMS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK3_W:[0-9]+]]}
+// CHECK-NEXT: ![[PACK3_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: !DIDerivedType(tag: DW_TAG_reference_type
+// CHECK-NEXT: ![[PACK3_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
+// CHECK-NEXT: ![[PACK3_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NEXT: ![[PACK3_W]] = !DIDerivedType(tag: DW_TAG_member, name: "w"
+// CHECK-NOT:  DW_TAG_member
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK4]]
+// CHECK-SAME:                           elements: ![[PACK4_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK4_ELEMS]] = !{![[PACK4_ARGS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK4_ARGS]]
+// CHECK-SAME:                      ![[PACK4_X:[0-9]+]]
+// CHECK-SAME:                      ![[PACK4_PARAMS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK4_PARAMS]]
+// CHECK-SAME:                      ![[PACK4_W:[0-9]+]]}
+// CHECK-NEXT: ![[PACK4_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK4_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
+// CHECK-NEXT: ![[PACK4_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NEXT: ![[PACK4_W]] = !DIDerivedType(tag: DW_TAG_member, name: "w"
+// CHECK-NOT:  DW_TAG_member
+
+struct Foo {
+  template<typename... Args>
+  auto capture_pack_and_this(Args... args) {
+    auto val1 = [this, args..., ...params = args] {
+      return w;
+    }();
+
+    auto val2 = [args..., this, ...params = args] {
+      return w;
+    }();
+
+    auto val3 = [args..., ...params = args, this] {
+      return w;
+    }();
+
+    return val1 + val2 + val3;
+  }
+
+  int w = 10;
+} f;
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK5]]
+// CHECK-SAME:                           elements: ![[PACK5a_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK5a_ELEMS]] = !{![[PACK5a_THIS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK5a_ARGS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK5a_PARAMS:[0-9]+]]}
+// CHECK-NEXT: ![[PACK5a_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-NEXT: ![[PACK5a_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK5a_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NOT:  DW_TAG_member
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK5]]
+// CHECK-SAME:                           elements: ![[PACK5b_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK5b_ELEMS]] = !{![[PACK5b_ARGS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK5b_THIS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK5b_PARAMS:[0-9]+]]}
+// CHECK-NEXT: ![[PACK5b_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK5b_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-NEXT: ![[PACK5b_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NOT:  DW_TAG_member
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK5]]
+// CHECK-SAME:                           elements: ![[PACK5c_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK5c_ELEMS]] = !{![[PACK5c_ARGS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK5c_PARAMS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK5c_THIS:[0-9]+]]}
+// CHECK-NEXT: ![[PACK5c_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK5c_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NEXT: ![[PACK5c_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-NOT:  DW_TAG_member
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK6]]
+// CHECK-SAME:                           elements: ![[PACK6a_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK6a_ELEMS]] = !{![[PACK6a_THIS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6a_ARGS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6a_ARGS]]
+// CHECK-SAME:                       ![[PACK6a_PARAMS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6a_PARAMS]]
+// CHECK-NEXT: ![[PACK6a_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-NEXT: ![[PACK6a_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK6a_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NOT:  DW_TAG_member
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK6]]
+// CHECK-SAME:                           elements: ![[PACK6b_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK6b_ELEMS]] = !{![[PACK6b_ARGS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6b_ARGS]]
+// CHECK-SAME:                       ![[PACK6b_THIS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6b_PARAMS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6b_PARAMS]]}
+// CHECK-NEXT: ![[PACK6b_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK6b_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-NEXT: ![[PACK6b_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NOT:  DW_TAG_member
+
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK6]]
+// CHECK-SAME:                           elements: ![[PACK6c_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK6c_ELEMS]] = !{![[PACK6c_ARGS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6c_ARGS]]
+// CHECK-SAME:                       ![[PACK6c_PARAMS:[0-9]+]]
+// CHECK-SAME:                       ![[PACK6c_PARAMS]]
+// CHECK-SAME:                       ![[PACK6c_THIS:[0-9]+]]}
+// CHECK-NEXT: ![[PACK6c_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK6c_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NEXT: ![[PACK6c_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-NOT:  DW_TAG_member
+
+int main() {
+  return capture_pack(1)
+         + capture_pack(1, 2)
+         + capture_pack_and_locals(1, 2)
+         + capture_pack_and_locals(1, 2, 3)
+         + f.capture_pack_and_this(1)
+         + f.capture_pack_and_this(1, 2);
+}

>From 9f5b052e0a5d5cd82d58b738d895f4b81c8e251a Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuch12 at gmail.com>
Date: Thu, 25 Sep 2025 14:41:22 +0100
Subject: [PATCH 2/3] fixup! add structured binding test

---
 .../DebugInfo/CXX/lambda-capture-packs.cpp    | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp b/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
index d5fd442ff2936..0e9dc0a3d1229 100644
--- a/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
+++ b/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
@@ -8,6 +8,7 @@
 // CHECK: ![[PACK4:[0-9]+]] = distinct !DISubprogram(name: "capture_pack_and_locals<int, int>"
 // CHECK: ![[PACK5:[0-9]+]] = distinct !DISubprogram(name: "capture_pack_and_this<int>"
 // CHECK: ![[PACK6:[0-9]+]] = distinct !DISubprogram(name: "capture_pack_and_this<int, int>"
+// CHECK: ![[PACK7:[0-9]+]] = distinct !DISubprogram(name: "capture_binding_and_param_pack<int, int>"
 
 template<typename... Args>
 auto capture_pack(Args... args) {
@@ -155,11 +156,41 @@ struct Foo {
 // CHECK-NEXT: ![[PACK6c_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
 // CHECK-NOT:  DW_TAG_member
 
+template<typename... Args>
+auto capture_binding_and_param_pack(Args... args) {
+  struct C { int x = 2; int y = 3; };
+
+  auto [x, ...e] = C();
+
+  return [&, args..., x, ...params = args,
+          ...es = e] {
+    return e...[0] + es...[0];
+  }();
+}
+
+// CHECK: distinct !DICompositeType(tag: DW_TAG_structure_type, name: "C"
+// CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK7]]
+// CHECK-SAME:                           elements: ![[PACK7_ELEMS:[0-9]+]]
+// CHECK-NEXT: ![[PACK7_ELEMS]] = !{![[PACK7_ARGS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK7_ARGS]]
+// CHECK-SAME:                      ![[PACK7_X:[0-9]+]]
+// CHECK-SAME:                      ![[PACK7_PARAMS:[0-9]+]]
+// CHECK-SAME:                      ![[PACK7_PARAMS]]
+// CHECK-SAME:                      ![[PACK7_ES:[0-9]+]]
+// CHECK-SAME:                      ![[PACK7_E:[0-9]+]]}
+// CHECK-NEXT: ![[PACK7_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-NEXT: ![[PACK7_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
+// CHECK-NEXT: ![[PACK7_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-NEXT: ![[PACK7_ES]] = !DIDerivedType(tag: DW_TAG_member, name: "es"
+// CHECK-NEXT: ![[PACK7_E]] = !DIDerivedType(tag: DW_TAG_member, name: "e"
+// CHECK-NOT:  DW_TAG_member
+
 int main() {
   return capture_pack(1)
          + capture_pack(1, 2)
          + capture_pack_and_locals(1, 2)
          + capture_pack_and_locals(1, 2, 3)
          + f.capture_pack_and_this(1)
-         + f.capture_pack_and_this(1, 2);
+         + f.capture_pack_and_this(1, 2)
+         + capture_binding_and_param_pack(1, 2);
 }

>From 5d3e643e865c96fd2025d4a068a3c30ad9a5846e Mon Sep 17 00:00:00 2001
From: Michael Buch <michaelbuch12 at gmail.com>
Date: Fri, 26 Sep 2025 07:47:11 +0100
Subject: [PATCH 3/3] fixup! relax CHECK order

---
 .../DebugInfo/CXX/lambda-capture-packs.cpp    | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp b/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
index 0e9dc0a3d1229..021b85d4ce3a4 100644
--- a/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
+++ b/clang/test/DebugInfo/CXX/lambda-capture-packs.cpp
@@ -19,19 +19,19 @@ auto capture_pack(Args... args) {
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK1]]
 // CHECK-SAME:                           elements: ![[PACK1_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK1_ELEMS]] = !{![[PACK1_ARGS:[0-9]+]], ![[PACK1_PARAMS:[0-9]+]]}
-// CHECK-NEXT: ![[PACK1_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK1_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK1_ELEMS]] = !{![[PACK1_ARGS:[0-9]+]], ![[PACK1_PARAMS:[0-9]+]]}
+// CHECK-DAG:  ![[PACK1_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK1_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
 // CHECK-NOT:  DW_TAG_member
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK2]]
 // CHECK-SAME:                           elements: ![[PACK2_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK2_ELEMS]] = !{![[PACK2_ARGS:[0-9]+]]
+// CHECK:      ![[PACK2_ELEMS]] = !{![[PACK2_ARGS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK2_ARGS]]
 // CHECK-SAME:                      ![[PACK2_PARAMS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK2_PARAMS]]}
-// CHECK-NEXT: ![[PACK2_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK2_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK2_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK2_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
 // CHECK-NOT:  DW_TAG_member
 
 template<typename... Args>
@@ -44,29 +44,29 @@ auto capture_pack_and_locals(int x, Args... args) {
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK3]]
 // CHECK-SAME:                           elements: ![[PACK3_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK3_ELEMS]] = !{![[PACK3_ARGS:[0-9]+]]
+// CHECK:      ![[PACK3_ELEMS]] = !{![[PACK3_ARGS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK3_X:[0-9]+]]
 // CHECK-SAME:                      ![[PACK3_PARAMS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK3_W:[0-9]+]]}
-// CHECK-NEXT: ![[PACK3_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: !DIDerivedType(tag: DW_TAG_reference_type
-// CHECK-NEXT: ![[PACK3_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
-// CHECK-NEXT: ![[PACK3_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
-// CHECK-NEXT: ![[PACK3_W]] = !DIDerivedType(tag: DW_TAG_member, name: "w"
+// CHECK-DAG:  ![[PACK3_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  !DIDerivedType(tag: DW_TAG_reference_type
+// CHECK-DAG:  ![[PACK3_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
+// CHECK-DAG:  ![[PACK3_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK3_W]] = !DIDerivedType(tag: DW_TAG_member, name: "w"
 // CHECK-NOT:  DW_TAG_member
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK4]]
 // CHECK-SAME:                           elements: ![[PACK4_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK4_ELEMS]] = !{![[PACK4_ARGS:[0-9]+]]
+// CHECK:      ![[PACK4_ELEMS]] = !{![[PACK4_ARGS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK4_ARGS]]
 // CHECK-SAME:                      ![[PACK4_X:[0-9]+]]
 // CHECK-SAME:                      ![[PACK4_PARAMS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK4_PARAMS]]
 // CHECK-SAME:                      ![[PACK4_W:[0-9]+]]}
-// CHECK-NEXT: ![[PACK4_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK4_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
-// CHECK-NEXT: ![[PACK4_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
-// CHECK-NEXT: ![[PACK4_W]] = !DIDerivedType(tag: DW_TAG_member, name: "w"
+// CHECK-DAG:  ![[PACK4_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK4_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
+// CHECK-DAG:  ![[PACK4_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK4_W]] = !DIDerivedType(tag: DW_TAG_member, name: "w"
 // CHECK-NOT:  DW_TAG_member
 
 struct Foo {
@@ -92,68 +92,68 @@ struct Foo {
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK5]]
 // CHECK-SAME:                           elements: ![[PACK5a_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK5a_ELEMS]] = !{![[PACK5a_THIS:[0-9]+]]
+// CHECK:      ![[PACK5a_ELEMS]] = !{![[PACK5a_THIS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK5a_ARGS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK5a_PARAMS:[0-9]+]]}
-// CHECK-NEXT: ![[PACK5a_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
-// CHECK-NEXT: ![[PACK5a_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK5a_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK5a_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-DAG:  ![[PACK5a_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK5a_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
 // CHECK-NOT:  DW_TAG_member
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK5]]
 // CHECK-SAME:                           elements: ![[PACK5b_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK5b_ELEMS]] = !{![[PACK5b_ARGS:[0-9]+]]
+// CHECK:      ![[PACK5b_ELEMS]] = !{![[PACK5b_ARGS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK5b_THIS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK5b_PARAMS:[0-9]+]]}
-// CHECK-NEXT: ![[PACK5b_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK5b_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
-// CHECK-NEXT: ![[PACK5b_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK5b_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK5b_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-DAG:  ![[PACK5b_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
 // CHECK-NOT:  DW_TAG_member
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK5]]
-// CHECK-SAME:                           elements: ![[PACK5c_ELEMS:[0-9]+]]
+// CHECK:                                elements: ![[PACK5c_ELEMS:[0-9]+]]
 // CHECK-NEXT: ![[PACK5c_ELEMS]] = !{![[PACK5c_ARGS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK5c_PARAMS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK5c_THIS:[0-9]+]]}
-// CHECK-NEXT: ![[PACK5c_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK5c_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
-// CHECK-NEXT: ![[PACK5c_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-DAG:  ![[PACK5c_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK5c_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK5c_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
 // CHECK-NOT:  DW_TAG_member
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK6]]
 // CHECK-SAME:                           elements: ![[PACK6a_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK6a_ELEMS]] = !{![[PACK6a_THIS:[0-9]+]]
+// CHECK:      ![[PACK6a_ELEMS]] = !{![[PACK6a_THIS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6a_ARGS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6a_ARGS]]
 // CHECK-SAME:                       ![[PACK6a_PARAMS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6a_PARAMS]]
-// CHECK-NEXT: ![[PACK6a_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
-// CHECK-NEXT: ![[PACK6a_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK6a_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK6a_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-DAG:  ![[PACK6a_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK6a_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
 // CHECK-NOT:  DW_TAG_member
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK6]]
 // CHECK-SAME:                           elements: ![[PACK6b_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK6b_ELEMS]] = !{![[PACK6b_ARGS:[0-9]+]]
+// CHECK:      ![[PACK6b_ELEMS]] = !{![[PACK6b_ARGS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6b_ARGS]]
 // CHECK-SAME:                       ![[PACK6b_THIS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6b_PARAMS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6b_PARAMS]]}
-// CHECK-NEXT: ![[PACK6b_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK6b_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
-// CHECK-NEXT: ![[PACK6b_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK6b_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK6b_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-DAG:  ![[PACK6b_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
 // CHECK-NOT:  DW_TAG_member
 
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK6]]
 // CHECK-SAME:                           elements: ![[PACK6c_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK6c_ELEMS]] = !{![[PACK6c_ARGS:[0-9]+]]
+// CHECK:      ![[PACK6c_ELEMS]] = !{![[PACK6c_ARGS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6c_ARGS]]
 // CHECK-SAME:                       ![[PACK6c_PARAMS:[0-9]+]]
 // CHECK-SAME:                       ![[PACK6c_PARAMS]]
 // CHECK-SAME:                       ![[PACK6c_THIS:[0-9]+]]}
-// CHECK-NEXT: ![[PACK6c_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK6c_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
-// CHECK-NEXT: ![[PACK6c_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
+// CHECK-DAG:  ![[PACK6c_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK6c_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK6c_THIS]] = !DIDerivedType(tag: DW_TAG_member, name: "this"
 // CHECK-NOT:  DW_TAG_member
 
 template<typename... Args>
@@ -171,18 +171,18 @@ auto capture_binding_and_param_pack(Args... args) {
 // CHECK: distinct !DICompositeType(tag: DW_TAG_structure_type, name: "C"
 // CHECK:      distinct !DICompositeType(tag: DW_TAG_class_type, scope: ![[PACK7]]
 // CHECK-SAME:                           elements: ![[PACK7_ELEMS:[0-9]+]]
-// CHECK-NEXT: ![[PACK7_ELEMS]] = !{![[PACK7_ARGS:[0-9]+]]
+// CHECK:      ![[PACK7_ELEMS]] = !{![[PACK7_ARGS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK7_ARGS]]
 // CHECK-SAME:                      ![[PACK7_X:[0-9]+]]
 // CHECK-SAME:                      ![[PACK7_PARAMS:[0-9]+]]
 // CHECK-SAME:                      ![[PACK7_PARAMS]]
 // CHECK-SAME:                      ![[PACK7_ES:[0-9]+]]
 // CHECK-SAME:                      ![[PACK7_E:[0-9]+]]}
-// CHECK-NEXT: ![[PACK7_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
-// CHECK-NEXT: ![[PACK7_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
-// CHECK-NEXT: ![[PACK7_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
-// CHECK-NEXT: ![[PACK7_ES]] = !DIDerivedType(tag: DW_TAG_member, name: "es"
-// CHECK-NEXT: ![[PACK7_E]] = !DIDerivedType(tag: DW_TAG_member, name: "e"
+// CHECK-DAG:  ![[PACK7_ARGS]] = !DIDerivedType(tag: DW_TAG_member, name: "args"
+// CHECK-DAG:  ![[PACK7_X]] = !DIDerivedType(tag: DW_TAG_member, name: "x"
+// CHECK-DAG:  ![[PACK7_PARAMS]] = !DIDerivedType(tag: DW_TAG_member, name: "params"
+// CHECK-DAG:  ![[PACK7_ES]] = !DIDerivedType(tag: DW_TAG_member, name: "es"
+// CHECK-DAG:  ![[PACK7_E]] = !DIDerivedType(tag: DW_TAG_member, name: "e"
 // CHECK-NOT:  DW_TAG_member
 
 int main() {



More information about the cfe-commits mailing list