diff options
| -rw-r--r-- | gdb/dwarf2/read.c | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/self-spec.exp | 16 |
2 files changed, 22 insertions, 1 deletions
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index eb4cb9b..5b32089 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -9935,8 +9935,15 @@ inherit_abstract_dies (struct die_info *die, struct dwarf2_cu *cu) if (attr == nullptr) break; + die_info *prev_child_origin_die = child_origin_die; child_origin_die = follow_die_ref (child_origin_die, attr, &child_origin_cu); + + if (prev_child_origin_die == child_origin_die) + { + /* Handle DIE with self-reference. */ + break; + } } /* If missing DW_AT_abstract_origin, try the corresponding child diff --git a/gdb/testsuite/gdb.dwarf2/self-spec.exp b/gdb/testsuite/gdb.dwarf2/self-spec.exp index 71e7c12..b80f61d 100644 --- a/gdb/testsuite/gdb.dwarf2/self-spec.exp +++ b/gdb/testsuite/gdb.dwarf2/self-spec.exp @@ -14,7 +14,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check that gdb doesn't hang or segfault on reading a DIE with a -# specification reference to itself. +# specification/abstract_origin reference to itself. load_lib dwarf.exp @@ -27,11 +27,25 @@ set asm_file [standard_output_file $srcfile2] Dwarf::assemble $asm_file { cu {} { compile_unit {{language @DW_LANG_C_plus_plus}} { + # Check handling of self-referencing DIE. declare_labels c1 c1: class_type { {name c1} {specification :$c1} } + + # Check handling of self-referencing child DIE. Regression test + # for PR30799. + declare_labels f1 abstract_f1 f1_l + abstract_f1: subprogram {} + f1: subprogram { + {MACRO_AT_func {main}} + {abstract_origin :$abstract_f1} + } { + f1_l: label { + {abstract_origin :$f1_l} + } + } } } } |