[binutils-gdb] Use dwarf-to-dwarf-assembler.py on dw2-icc-opaque

Tom Tromey via Gdb-cvs <[email protected]>
Newsgroups gmane.comp.gdb.cvs
Message-ID <[email protected]> 
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=10ee115dff1badf11167a26c0cbfe4d1813a871b

commit 10ee115dff1badf11167a26c0cbfe4d1813a871b
Author: Tom Tromey <[email protected]>
Date:   Fri Feb 20 06:54:27 2026 -0700

    Use dwarf-to-dwarf-assembler.py on dw2-icc-opaque
    
    I ran dwarf-to-dwarf-assembler.py on the output of the dw2-icc-opaque
    test.  The test was already architecture-independent, but I think it's
    a bit easier to read this way.
    
    I made a couple of tiny edits to the output, that I don't think affect
    the test:
    
    * I slightly shortened the producer strings (removing the newline and
      subsequent text)
    * I changed a DW_AT_data_member_location to be a constant rather than
      an expression

Diff:
---
 gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.S   | 259 ----------------------------
 gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp |  72 +++++++-
 2 files changed, 67 insertions(+), 264 deletions(-)

diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.S b/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.S
deleted file mode 100644
index ca34356c962..00000000000
--- a/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.S
+++ /dev/null
@@ -1,259 +0,0 @@
-/* Copyright (C) 2011-2026 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* This test demonstrates a failure to resolve opaque structure types in
-   binaries compiled by the Intel C compiler.  This is GDB PR symtab/13277.
-
-   The test was derived from opaque-pointer.c, which contains the single line:
-
-   struct opaque_struct_t *p_struct;
-
-   and opaque_struct.c, which looks like:
-
-   struct opaque_struct_t
-   {
-     int wrapped_value;
-   };
-
-   struct opaque_struct_t opaque_internal = { 0 };
-
-   What follows is a simplified version of the debug info generated by ICC
-   version 12.0.4.191. */
-
-	.file "opaque-pointer.c"
-	.data
-	.comm p_struct,8,8
-	.global p_struct
-
-	.section .debug_info
-debug_info_seg1:
-	.4byte debug_info_seg1_end - 1f	/* Length of compilation unit info. */
-1:
-	.2byte 0x0002			/* DWARF version number. */
-	.4byte .debug_abbrev_seg1	/* Points to abbrev section for this unit. */
-	.byte 0x04			/* Target address size. */
-
-	.byte 0x01			/* DIE 1: DW_TAG_compile_unit. */
-	.byte 0x01			/* DW_AT_language = DW_LANG_C89. */
-	.ascii "Intel(R) C Intel(R) 64 Compiler XE "	/* DW_AT_producer. */
-	.ascii "for applications running on Intel(R) 64, "
-	.ascii "Version 12.0.4.191 Build 20110427\n "
-	.asciz "Fixes SameLinkageName MemberPointers"
-
-	.byte 0x02			/* DIE 2: DW_TAG_variable. */
-	.byte 0x01			/* DW_AT_accessibility. */
-	.asciz "p_struct"		/* DW_AT_name. */
-	.4byte 3f - debug_info_seg1	/* DW_AT_type. */
-	.byte 0x05			/* DW_AT_location: 5 bytes ... */
-	.byte 0x03			/* DW_OP_addr ... */
-	.4byte p_struct			/* followed by the address of p_struct. */
-	.byte 0x01			/* DW_AT_external. */
-
-3:
-	.byte 0x03			/* DIE 3: DW_TAG_pointer_type. */
-	.4byte 4f - debug_info_seg1	/* DW_AT_type. */
-
-4:
-	.byte 0x04			/* DIE 4: DW_TAG_structure_type. */
-	.byte 0x01			/* DW_AT_accessibility. */
-	.byte 0x00			/* DW_AT_byte_size. */
-	.asciz "opaque_struct_t"	/* DW_AT_name. */
-
-	.byte 0x00			/* End DIE 1. */
-debug_info_seg1_end:
-
-	.section .debug_abbrev
-.debug_abbrev_seg1:
-	.byte 0x01	/* Abbrev 1. */
-	.byte 0x11	/* DW_TAG_compile_unit. */
-	.byte 0x01	/* DW_CHILDREN_yes. */
-	.byte 0x13	/* DW_AT_language. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x25	/* DW_AT_producer. */
-	.byte 0x08	/* DW_AT_string. */
-	.2byte 0x0000	/* End abbrev. */
-
-	.byte 0x02	/* Abbrev 2. */
-	.byte 0x34	/* DW_TAG_variable. */
-	.byte 0x00	/* DW_CHILDREN_no. */
-	.byte 0x32	/* DW_AT_accessibility. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x03	/* DW_AT_name. */
-	.byte 0x08	/* DW_FORM_string. */
-	.byte 0x49	/* DW_AT_type. */
-	.byte 0x13	/* DW_FORM_ref4. */
-	.byte 0x02	/* DW_AT_location. */
-	.byte 0x0a	/* DW_FORM_block1. */
-	.byte 0x3f	/* DW_AT_external. */
-	.byte 0x0c	/* DW_FORM_flag. */
-	.2byte 0x0000	/* End abbrev. */
-
-	.byte 0x03	/* Abbrev 3. */
-	.byte 0x0f	/* DW_TAG_pointer_type. */
-	.byte 0x00	/* DW_CHILDREN_no. */
-	.byte 0x49	/* DW_AT_type. */
-	.byte 0x13	/* DW_FORM_ref4. */
-	.2byte 0x0000	/* End abbrev. */
-
-	.byte 0x04	/* Abbrev 4. */
-	.byte 0x13	/* DW_TAG_structure_type. */
-	.byte 0x00	/* DW_CHILDREN_no. */
-	.byte 0x32	/* DW_AT_accessibility. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x0b	/* DW_AT_byte_size. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x03	/* DW_AT_name. */
-	.byte 0x08	/* DW_FORM_string. */
-	.2byte 0x0000	/* End abbrev. */
-	.byte 0x00	/* End abbrev table. */
-
-
-	.file "opaque-struct.c"
-	.section .debug_info
-debug_info_seg2:
-	.4byte debug_info_seg2_end - 1f	/* Length of compilation unit info. */
-1:
-	.2byte 0x0002			/* DWARF version number. */
-	.4byte .debug_abbrev_seg2	/* Points to abbrev section for this unit. */
-	.byte 0x04			/* Target address size. */
-
-	.byte 0x01			/* DIE 1: DW_TAG_compile_unit. */
-	.byte 0x01			/* DW_AT_language = DW_LANG_C89. */
-	.ascii "Intel(R) C Intel(R) 64 Compiler XE "	/* DW_AT_producer. */
-	.ascii "for applications running on Intel(R) 64, "
-	.ascii "Version 12.0.4.191 Build 20110427\n "
-	.asciz "Fixes SameLinkageName MemberPointers"
-
-	.byte 0x02			/* DIE 2: DW_TAG_structure_type. */
-	.byte 0x01			/* DW_AT_accessibility. */
-	.byte 0x04			/* DW_AT_byte_size. */
-	.asciz "opaque_struct_t"	/* DW_AT_name. */
-
-
-	.byte 0x03			/* DIE 3: DW_TAG_member. */
-	.byte 0x02			/* DW_AT_data_member_location: 2 bytes ... */
-	.byte 0x23			/* DW_OP_plus_uconst ... */
-	.byte 0x00			/* followed by zero. */
-	.asciz "wrapped_value"		/* DW_AT_name. */
-	.4byte 4f - debug_info_seg2	/* DW_AT_type. */
-	.byte 0x00
-
-4:
-	.byte 0x04			/* DIE 4: DW_TAG_base_type. */
-	.byte 0x04			/* DW_AT_byte_size. */
-	.byte 0x05			/* DW_AT_encoding. */
-	.asciz "int"			/* DW_AT_name. */
-
-	.byte 0x00			/* End DIE 1. */
-debug_info_seg2_end:
-
-	.section .debug_abbrev
-.debug_abbrev_seg2:
-	.byte 0x01	/* Abbrev 1. */
-	.byte 0x11	/* DW_TAG_compile_unit. */
-	.byte 0x01	/* DW_CHILDREN_yes. */
-	.byte 0x13	/* DW_AT_language. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x25	/* DW_AT_producer. */
-	.byte 0x08	/* DW_FORM_string. */
-	.2byte 0x0000	/* End abbrev. */
-
-	.byte 0x02	/* Abbrev 2. */
-	.byte 0x13	/* DW_TAG_structure_type. */
-	.byte 0x01	/* DW_CHILDREN_yes. */
-	.byte 0x32	/* DW_AT_accessibility. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x0b	/* DW_AT_byte_size. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x03	/* DW_AT_name. */
-	.byte 0x08	/* DW_FORM_string. */
-	.2byte 0x0000	/* End abbrev. */
-
-	.byte 0x03	/* Abbrev 3. */
-	.byte 0x0d	/* DW_TAG_member. */
-	.byte 0x00	/* DW_CHILDREN_no. */
-	.byte 0x38	/* DW_AT_data_member_location. */
-	.byte 0x0a	/* DW_FORM_block1. */
-	.byte 0x03	/* DW_AT_name. */
-	.byte 0x08	/* DW_FORM_string. */
-	.byte 0x49	/* DW_AT_type. */
-	.byte 0x13	/* DW_FORM_ref4. */
-	.2byte 0x0000	/* End abbrev. */
-
-	.byte 0x04	/* Abbrev 4. */
-	.byte 0x24	/* DW_TAG_base_type. */
-	.byte 0x00	/* DW_CHILDREN_no. */
-	.byte 0x0b	/* DW_AT_byte_size. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x3e	/* DW_AT_encoding. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x03	/* DW_AT_name. */
-	.byte 0x08	/* DW_FORM_string. */
-	.2byte 0x0000	/* End abbrev. */
-	.byte 0x00	/* End abbrev table. */
-
-
-	.file "opaque-pointer2.c"
-
-	.section .debug_info
-debug_info_seg3:
-	.4byte debug_info_seg3_end - 1f	/* Length of compilation unit info. */
-1:
-	.2byte 0x0002			/* DWARF version number. */
-	.4byte .debug_abbrev_seg3	/* Points to abbrev section for this unit. */
-	.byte 0x04			/* Target address size. */
-
-	.byte 0x01			/* DIE 1: DW_TAG_compile_unit. */
-	.byte 0x01			/* DW_AT_language = DW_LANG_C89. */
-	.ascii "Intel(R) C Intel(R) 64 Compiler XE "	/* DW_AT_producer. */
-	.ascii "for applications running on Intel(R) 64, "
-	.ascii "Version 12.0.4.191 Build 20110427\n "
-	.asciz "Fixes SameLinkageName MemberPointers"
-
-	.byte 0x04			/* DIE 4: DW_TAG_structure_type. */
-	.byte 0x01			/* DW_AT_accessibility. */
-	.byte 0x00			/* DW_AT_byte_size. */
-	.asciz "opaque_struct_t"	/* DW_AT_name. */
-
-	.byte 0x00			/* End DIE 1. */
-debug_info_seg3_end:
-
-	.section .debug_abbrev
-.debug_abbrev_seg3:
-	.byte 0x01	/* Abbrev 1. */
-	.byte 0x11	/* DW_TAG_compile_unit. */
-	.byte 0x01	/* DW_CHILDREN_yes. */
-	.byte 0x13	/* DW_AT_language. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x25	/* DW_AT_producer. */
-	.byte 0x08	/* DW_AT_string. */
-	.2byte 0x0000	/* End abbrev. */
-
-	.byte 0x04	/* Abbrev 4. */
-	.byte 0x13	/* DW_TAG_structure_type. */
-	.byte 0x00	/* DW_CHILDREN_no. */
-	.byte 0x32	/* DW_AT_accessibility. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x0b	/* DW_AT_byte_size. */
-	.byte 0x0b	/* DW_FORM_data1. */
-	.byte 0x03	/* DW_AT_name. */
-	.byte 0x08	/* DW_FORM_string. */
-	.2byte 0x0000	/* End abbrev. */
-	.byte 0x00	/* End abbrev table. */
-#ifdef __arm__
-	.section	.note.GNU-stack,"",%progbits
-#else
-	.section	.note.GNU-stack,"",@progbits
-#endif
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp b/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp
index 9f042026a8c..d28b6a93689 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-icc-opaque.exp
@@ -21,14 +21,76 @@ load_lib dwarf.exp
 # This test can only be run on targets which support DWARF-2 and use gas.
 require dwarf2_support
 
-standard_testfile .S
-set executable ${testfile}
+standard_testfile main.c -debug.S
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {}] != "" } {
-    return -1
+set asm_file [standard_output_file $srcfile2]
+Dwarf::assemble $asm_file {
+    global srcdir subdir srcfile
+    declare_labels opaque_struct_t int pointer_type
+
+    cu {version 2 addr_size 4} {
+	DW_TAG_compile_unit {
+	    DW_AT_language @DW_LANG_C89
+	    DW_AT_producer {Intel(R) C Intel(R) 64 Compiler XE for applications running on Intel(R) 64, Version 12.0.4.191 Build 20110427} DW_FORM_string
+	} {
+	    DW_TAG_variable {
+		DW_AT_accessibility 1 DW_FORM_data1
+		DW_AT_name p_struct DW_FORM_string
+		DW_AT_type :$pointer_type
+		DW_AT_location { DW_OP_addr 8 } SPECIAL_expr
+		DW_AT_external 1 DW_FORM_flag
+	    }
+	    pointer_type: DW_TAG_pointer_type {
+		DW_AT_type :$opaque_struct_t
+	    }
+	    opaque_struct_t: DW_TAG_structure_type {
+		DW_AT_accessibility 1 DW_FORM_data1
+		DW_AT_byte_size 0 DW_FORM_data1
+		DW_AT_name opaque_struct_t DW_FORM_string
+	    }
+	}
+    }
+    cu {version 2 addr_size 4} {
+	DW_TAG_compile_unit {
+	    DW_AT_language @DW_LANG_C89
+	    DW_AT_producer {Intel(R) C Intel(R) 64 Compiler XE for applications running on Intel(R) 64, Version 12.0.4.191 Build 20110427} DW_FORM_string
+	} {
+	    DW_TAG_structure_type {
+		DW_AT_accessibility 1 DW_FORM_data1
+		DW_AT_byte_size 4 DW_FORM_data1
+		DW_AT_name opaque_struct_t DW_FORM_string
+	    } {
+		DW_TAG_member {
+		    DW_AT_data_member_location 0 DW_FORM_data1
+		    DW_AT_name wrapped_value DW_FORM_string
+		    DW_AT_type :$int
+		}
+	    }
+	    int: DW_TAG_base_type {
+		DW_AT_byte_size 4 DW_FORM_data1
+		DW_AT_encoding @DW_ATE_signed
+		DW_AT_name int DW_FORM_string
+	    }
+	}
+    }
+    cu {version 2 addr_size 4} {
+	DW_TAG_compile_unit {
+	    DW_AT_language @DW_LANG_C89
+	    DW_AT_producer {Intel(R) C Intel(R) 64 Compiler XE for applications running on Intel(R) 64, Version 12.0.4.191 Build 20110427} DW_FORM_string
+	} {
+	    DW_TAG_structure_type {
+		DW_AT_accessibility 1 DW_FORM_data1
+		DW_AT_byte_size 0 DW_FORM_data1
+		DW_AT_name opaque_struct_t DW_FORM_string
+	    }
+	}
+    }
 }
 
-clean_restart $executable
+if { [prepare_for_testing "failed to prepare" ${testfile} \
+	  [list $srcfile $asm_file] {nodebug}] } {
+    return
+}
 
 # Before PR 13277 was fixed, this would output:
 # type = struct opaque_struct_t {
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.