[Bug symtab/27336] [dwarf-5] abort on info addr in gdb.cp/temargs.exp

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=27336

--- Comment #3 from Tom de Vries <vries at gcc dot gnu.org> ---
Tentative fix:
...
diff --git a/gdb/dwarf2/attribute.h b/gdb/dwarf2/attribute.h
index aded129764a..baf93903d19 100644
--- a/gdb/dwarf2/attribute.h
+++ b/gdb/dwarf2/attribute.h
@@ -70,7 +70,7 @@ struct attribute
      form.  */
   LONGEST as_signed () const
   {
-    gdb_assert (form == DW_FORM_sdata || form == DW_FORM_implicit_const);
+    gdb_assert (form_is_signed ());
     return u.snd;
   }

@@ -92,6 +92,28 @@ struct attribute
     return u.unsnd;
   }

+  /* Return true if the value is nonnegative.  Requires that that
+     reprocessing not be needed.  */
+  bool is_nonnegative () const
+  {
+    if (form_is_unsigned ())
+      return true;
+    if (form_is_signed ())
+      return as_signed () >= (LONGEST)0;
+    return false;
+  }
+
+  /* Return the nonnegative value.  Requires that that reprocessing not be
+     needed.  */
+  ULONGEST as_nonnegative () const
+  {
+    if (form_is_unsigned ())
+      return as_unsigned ();
+    if (form_is_signed ())
+      return (ULONGEST)as_signed ();
+    gdb_assert (false);
+  }
+
   /* Return non-zero if ATTR's value is a section offset --- classes
      lineptr, loclistptr, macptr or rangelistptr --- or zero, otherwise.
      You may use the as_unsigned method to retrieve such offsets.
@@ -147,6 +169,9 @@ struct attribute
   /* Check if the attribute's form is an unsigned integer form.  */
   bool form_is_unsigned () const;

+  /* Check if the attribute's form is a signed integer form.  */
+  bool form_is_signed () const;
+
   /* Check if the attribute's form is a form that requires
      "reprocessing".  */
   bool form_requires_reprocessing () const;
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index bcac94ed36a..35e6ba0044a 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -21427,10 +21427,10 @@ new_symbol (struct die_info *die, struct type *type,
struct 
dwarf2_cu *cu,
       attr = dwarf2_attr (die,
                          inlined_func ? DW_AT_call_file : DW_AT_decl_file,
                          cu);
-      if (attr != nullptr && attr->form_is_unsigned ())
+      if (attr != nullptr && attr->is_nonnegative ())
        {
          file_name_index file_index
-           = (file_name_index) attr->as_unsigned ();
+           = (file_name_index) attr->as_nonnegative ();
          struct file_entry *fe;

          if (cu->line_header != NULL)
...

-- 
You are receiving this mail because:
You are on the CC list for the bug.