FT32 makes use of multiple address spaces. When trying to inspect
objects in GDB, GDB was treating them as a straight "const". The cause
seems to be in GCC DWARF2 output.

This output is handled in gcc/gcc/dwarf2out.c, where modified_type_die()
checks that TYPE has qualifiers CV_QUALS. However while TYPE has
ADDR_SPACE qualifiers, the modified_type_die() explicitly discards the
ADDR_SPACE qualifiers.

This patch retains the ADDR_SPACE qualifiers as modified_type_die()
outputs the DWARF type tree.  This allows the types to match, and correct
type information for the object is emitted.

OK to commit?

[gcc]

2016-07-07  James Bowman  <james.bow...@ftdichip.com>

        * gcc/dwarf2out.c (modified_type_die): Retain ADDR_SPACE
        qualifiers.
        (add_type_attribute) likewise.

Index: gcc/dwarf2out.c
===================================================================
--- gcc/dwarf2out.c     (revision 237998)
+++ gcc/dwarf2out.c     (working copy)
@@ -11222,7 +11222,8 @@ modified_type_die (tree type, int cv_qua
   dw_die_ref mod_scope;
   /* Only these cv-qualifiers are currently handled.  */
   const int cv_qual_mask = (TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE
-                           | TYPE_QUAL_RESTRICT | TYPE_QUAL_ATOMIC);
+                           | TYPE_QUAL_RESTRICT | TYPE_QUAL_ATOMIC | 
+                           ENCODE_QUAL_ADDR_SPACE(~0U));
 
   if (code == ERROR_MARK)
     return NULL;
@@ -19027,7 +19028,7 @@ add_type_attribute (dw_die_ref object_di
     return;
 
   type_die = modified_type_die (type,
-                               cv_quals | TYPE_QUALS_NO_ADDR_SPACE (type),
+                               cv_quals | TYPE_QUALS (type),
                                reverse,
                                context_die);
 

Reply via email to