]> git.ipfire.org Git - thirdparty/binutils-gdb.git/commitdiff
Start abbrevs at 1 in DWARF assembler
authorTom Tromey <tom@tromey.com>
Wed, 6 Dec 2023 16:26:33 +0000 (17:26 +0100)
committerTom de Vries <tdevries@suse.de>
Wed, 6 Dec 2023 16:26:33 +0000 (17:26 +0100)
I noticed that the DWARF assembler starts abbrevs at 2.
I think 1 should be preferred.

Co-Authored-By: Tom de Vries <tdevries@suse.de>
gdb/testsuite/lib/dwarf.exp

index f09da0430ab7b473fcea5d0b1bc19804972549aa..a9b5be859a87e3216a1ad1b1129ca64fd43a9c80 100644 (file)
@@ -958,13 +958,22 @@ namespace eval Dwarf {
        _handle_macro_at_range $attr_value
     }
 
+    # Return the next available abbrev number in the current CU's abbrev
+    # table.
+    proc _get_abbrev_num {} {
+       variable _abbrev_num
+       set res $_abbrev_num
+       incr _abbrev_num
+       return $res
+    }
+
     proc _handle_DW_TAG {tag_name {attrs {}} {children {}}} {
        variable _abbrev_section
        variable _abbrev_num
        variable _constants
 
        set has_children [expr {[string length $children] > 0}]
-       set my_abbrev [incr _abbrev_num]
+       set my_abbrev [_get_abbrev_num]
 
        # We somewhat wastefully emit a new abbrev entry for each tag.
        # There's no reason for this other than laziness.