Loosen DWARF form check in discriminant-member.ll #139258
Merged
Conversation
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
The new test discriminant-member.ll (see llvm#138953) failed on AIX. I don't have ready access to AIX but looking at the report, it seems that the string form is different in the DWARF. The log reads: 50: DW_AT_name [DW_FORM_string] ("Discr") ... but the test only looks for DW_FORM_strp. Since the precise form isn't important here, this patch changes the test to accept any string form.
|
@llvm/pr-subscribers-debuginfo Author: Tom Tromey (tromey) ChangesThe new test discriminant-member.ll (see #138953) failed on AIX. I don't have ready access to AIX but looking at the report, it seems that the string form is different in the DWARF. The log reads: ... but the test only looks for DW_FORM_strp. Since the precise form isn't important here, this patch changes the test to accept any string form. Full diff: https://github.com/llvm/llvm-project/pull/139258.diff 1 Files Affected:
diff --git a/llvm/test/DebugInfo/Generic/discriminant-member.ll b/llvm/test/DebugInfo/Generic/discriminant-member.ll
index 8359aef870e14..b30ae435211a4 100644
--- a/llvm/test/DebugInfo/Generic/discriminant-member.ll
+++ b/llvm/test/DebugInfo/Generic/discriminant-member.ll
@@ -5,14 +5,14 @@
; of discriminants, and where both refer to a DIE that is not a child
; of the variant.
-; CHECK: DW_AT_name [DW_FORM_strp] ({{.*}} = "Discr")
+; CHECK: DW_AT_name [DW_FORM_str{{[a-z]+}}] ({{.*}} = "Discr")
; CHECK: DW_TAG_variant_part
; CHECK-NOT: TAG
; CHECK: DW_AT_discr [DW_FORM_ref4] (cu + {{0x[0-9a-fA-F]+}} => {[[OFFSET:0x[0-9a-fA-F]+]]})
; CHECK: DW_TAG_variant
; CHECK: DW_AT_discr_list [DW_FORM_block1] (<0x05> 00 17 01 61 6c )
; CHECK: DW_TAG_member
-; CHECK: DW_AT_name [DW_FORM_strp] ({{.*}} = "var0")
+; CHECK: DW_AT_name [DW_FORM_str{{[a-z]+}}] ({{.*}} = "var0")
; CHECK: DW_AT_type
; CHECK: DW_AT_alignment
; CHECK: DW_AT_data_member_location [DW_FORM_data1] (0x00)
|
|
@tromey, you can reproduce this (without access to an AIX machine) by adding |
hubert-reinterpretcast
approved these changes
May 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The new test discriminant-member.ll (see #138953) failed on AIX. It seems that the string form is different in the DWARF. The log reads:
... but the test only looks for DW_FORM_strp. Since the precise form isn't important here, this patch changes the test to accept any string form.