Fix clang/test/DebugInfo/CXX/line.cpp#198401
Merged
Michael137 merged 1 commit intoJun 4, 2026
Merged
Conversation
This PR twaeks the clang/test/DebugInfo/line.cpp test to pass on z/OS. The reason the test was failing is that the RUN lines which specify -triple %itanium_abi_triple expands to s390x-ibm-zos when run on z/OS. The IR that is emitted for this triple does not match the patterns expected by the test. This PR tweaks the patterns in the CHECK lines so that the test also passes on z/OS.
|
@llvm/pr-subscribers-clang Author: Ariel-Burton ChangesThis PR twaeks the clang/test/DebugInfo/line.cpp test to pass on z/OS. The reason the test was failing is that the RUN lines which specify -triple %itanium_abi_triple expands to s390x-ibm-zos when run on z/OS. The IR that is emitted for this triple does not match the patterns expected by the test. This PR tweaks the patterns in the CHECK lines so that the test also passes on z/OS. Full diff: https://github.com/llvm/llvm-project/pull/198401.diff 1 Files Affected:
diff --git a/clang/test/DebugInfo/CXX/line.cpp b/clang/test/DebugInfo/CXX/line.cpp
index 8ef0e024395d7..59568ed2469b7 100644
--- a/clang/test/DebugInfo/CXX/line.cpp
+++ b/clang/test/DebugInfo/CXX/line.cpp
@@ -8,7 +8,7 @@ int *sink();
extern "C" __complex float complex_src();
extern "C" __complex float *complex_sink();
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f1
void f1() {
*sink()
// CHECK: store {{.*}}, !dbg [[DBG_F1:!.*]]
@@ -24,7 +24,7 @@ struct foo {
foo();
};
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}foo
foo::foo()
:
#line 200
@@ -36,7 +36,7 @@ foo::foo()
(complex_src()) {
}
-// CHECK-LABEL: define {{.*}}f2{{.*}}
+// CHECK-LABEL: define {{.*}}void {{.*}}f2{{.*}}
void f2() {
// CHECK: store float {{.*}} !dbg [[DBG_F2:!.*]]
*complex_sink()
@@ -45,7 +45,7 @@ void f2() {
complex_src();
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f3
void f3() {
// CHECK: store float {{.*}} !dbg [[DBG_F3:!.*]]
*complex_sink()
@@ -54,14 +54,14 @@ void f3() {
complex_src();
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f4
void f4() {
#line 500
auto x // CHECK: store {{.*}} !dbg [[DBG_F4:!.*]]
= src();
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f5
void f5() {
#line 600
auto x // CHECK: store float {{.*}} !dbg [[DBG_F5:!.*]]
@@ -71,17 +71,17 @@ void f5() {
struct agg { int i; };
agg agg_src();
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f6
void f6() {
agg x;
- // CHECK: call void @llvm.memcpy{{.*}} !dbg [[DBG_F6:!.*]]
+ // CHECK: call void @llvm.memcpy{{.*}}ref.tmp{{.*}} !dbg [[DBG_F6:!.*]]
x
#line 700
= //
agg_src();
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f7
void f7() {
int *src1();
int src2();
@@ -90,7 +90,7 @@ void f7() {
src1())[src2()];
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f8
void f8() {
int src1[1];
int src2();
@@ -99,7 +99,7 @@ void f8() {
src1)[src2()];
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f9
void f9(int i) {
int src1[1][i];
int src2();
@@ -110,7 +110,7 @@ void f9(int i) {
inline void *operator new(decltype(sizeof(1)), void *p) noexcept { return p; }
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}void {{.*}}f10
void f10() {
void *void_src();
(
@@ -128,7 +128,7 @@ struct bar {
~bar() noexcept(false);
};
// global ctor cleanup
-// CHECK-LABEL: define
+// CHECK-LABEL: define {{.*}}global_var_init
// CHECK: invoke{{ }}
// CHECK: invoke{{ }}
// CHECK: to label {{.*}}, !dbg [[DBG_GLBL_CTOR_B:!.*]]
@@ -154,7 +154,7 @@ __complex double f11() {
return f;
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define{{.*}}f12
void f12() {
int f12_1();
void f12_2(int = f12_1());
@@ -163,7 +163,7 @@ void f12() {
f12_2();
}
-// CHECK-LABEL: define
+// CHECK-LABEL: define{{.*}}f13
void f13() {
// CHECK: call {{.*}} !dbg [[DBG_F13:!.*]]
#define F13_IMPL 1, src()
@@ -176,7 +176,7 @@ struct f14_impl {
f14_impl(int);
};
-// CHECK-LABEL: define
+// CHECK-LABEL: define{{.*}}f14_use
struct f14_use {
// CHECK: call {{.*}}f14_impl{{.*}}, !dbg [[DBG_F14_CTOR_CALL:![0-9]*]]
#line 1600
|
Contributor
Author
|
ping ... |
Michael137
reviewed
Jun 3, 2026
| extern "C" __complex float *complex_sink(); | ||
|
|
||
| // CHECK-LABEL: define | ||
| // CHECK-LABEL: define {{.*}}void {{.*}}f1 |
Member
There was a problem hiding this comment.
These are just for debuggability of the test right? They're not actually part of the fix?
Contributor
Author
There was a problem hiding this comment.
Yes. The CHECK-LABELS are clearly intended to synchronize the CHECK lines and the test input; as the test is more than a few lines these help to keep track of which function a CHECK line is associated with.
Michael137
approved these changes
Jun 4, 2026
Member
Michael137
left a comment
There was a problem hiding this comment.
SGTM if all the tests pass
Michael137
reviewed
Jun 4, 2026
| void f6() { | ||
| agg x; | ||
| // CHECK: call void @llvm.memcpy{{.*}} !dbg [[DBG_F6:!.*]] | ||
| // CHECK: call void @llvm.memcpy{{.*}}ref.tmp{{.*}} !dbg [[DBG_F6:!.*]] |
Member
There was a problem hiding this comment.
Bit surprised about this change. Wasn't the previous check looser than what you changed it to? Are we emitting more stuff on z/OS which would cause it to match against another memcpy, with the wrong debuginfo metadata?
Contributor
Author
There was a problem hiding this comment.
Yes. On z/OS there are two calls to @llvm.memory, This pattern ties it down.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR twaeks the clang/test/DebugInfo/line.cpp test to pass on z/OS.
The reason the test was failing is that the RUN lines which specify -triple %itanium_abi_triple expands to s390x-ibm-zos when run on z/OS. The IR that is emitted for this triple does not match the patterns expected by the test.
This PR tweaks the patterns in the CHECK lines so that the test also passes on z/OS.