re PR debug/80263 (gcc's internal type "sizetype" leaks out as base type name in...

	PR debug/80263
	* dwarf2out.c (modified_type_die): Try harder not to emit internal
	sizetype type into debug info.

	* gcc.dg/debug/dwarf2/pr80263.c: New test.

From-SVN: r246973

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fa3e257..38c0d30 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-18  Jakub Jelinek  <jakub@redhat.com>
+
+       PR debug/80263
+       * dwarf2out.c (modified_type_die): Try harder not to emit internal
+       sizetype type into debug info.
+
 2017-04-18  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        PR target/80099

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 89d1872..27fb9f0 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -12464,20 +12464,29 @@ modified_type_die (tree type, int cv_quals, bool reverse,
      this type.  */
   qualified_type = get_qualified_type (type, cv_quals);
 
-  if (qualified_type == sizetype
-      && TYPE_NAME (qualified_type)
-      && TREE_CODE (TYPE_NAME (qualified_type)) == TYPE_DECL)
+  if (qualified_type == sizetype)
     {
-      tree t = TREE_TYPE (TYPE_NAME (qualified_type));
+      /* Try not to expose the internal sizetype type's name.  */
+      if (TYPE_NAME (qualified_type)
+         && TREE_CODE (TYPE_NAME (qualified_type)) == TYPE_DECL)
+       {
+         tree t = TREE_TYPE (TYPE_NAME (qualified_type));
 
-      gcc_checking_assert (TREE_CODE (t) == INTEGER_TYPE
-                          && TYPE_PRECISION (t)
-                          == TYPE_PRECISION (qualified_type)
-                          && TYPE_UNSIGNED (t)
-                          == TYPE_UNSIGNED (qualified_type));
-      qualified_type = t;
+         gcc_checking_assert (TREE_CODE (t) == INTEGER_TYPE
+                              && (TYPE_PRECISION (t)
+                                  == TYPE_PRECISION (qualified_type))
+                              && (TYPE_UNSIGNED (t)
+                                  == TYPE_UNSIGNED (qualified_type)));
+         qualified_type = t;
+       }
+      else if (qualified_type == sizetype
+              && TREE_CODE (sizetype) == TREE_CODE (size_type_node)
+              && TYPE_PRECISION (sizetype) == TYPE_PRECISION (size_type_node)
+              && TYPE_UNSIGNED (sizetype) == TYPE_UNSIGNED (size_type_node))
+       qualified_type = size_type_node;
     }
 
+
   /* If we do, then we can just use its DIE, if it exists.  */
   if (qualified_type)
     {

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 000f471..4157094 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-18  Jakub Jelinek  <jakub@redhat.com>
+
+       PR debug/80263
+       * gcc.dg/debug/dwarf2/pr80263.c: New test.
+
 2017-04-18  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        PR target/80099

diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/pr80263.c b/gcc/testsuite/gcc.dg/debug/dwarf2/pr80263.c
new file mode 100644 (file)
index 0000000..57633b4
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/pr80263.c
@@ -0,0 +1,7 @@
+/* PR debug/80263 */
+/* { dg-do compile } */
+/* { dg-options "-g -dA" } */
+
+char array[1];
+
+/* { dg-final { scan-assembler-not {\msizetype} } } */