public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-7129] dwarf2out: Don't call expand_expr during early_dwarf [PR104407]
@ 2022-02-09 14:19 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2022-02-09 14:19 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:be9cd0ca8a5f13cfee6a39b217d439a25c53553a
commit r12-7129-gbe9cd0ca8a5f13cfee6a39b217d439a25c53553a
Author: Jakub Jelinek <jakub@redhat.com>
Date: Wed Feb 9 15:17:52 2022 +0100
dwarf2out: Don't call expand_expr during early_dwarf [PR104407]
As mentioned in the PR, since PR96690 r11-2834 we call rtl_for_decl_init
which can call expand_expr already during early_dwarf. The comment and PR
explains it that the intent is to ensure the referenced vars and functions
are properly mangled because free_lang_data doesn't cover everything, like
template parameters etc. It doesn't work well though, because expand_expr
can set DECL_RTLs e.g. on referenced vars and keep them there, and they can
be created e.g. with different MEM_ALIGN compared to what they would be
created with if they were emitted later.
So, the following patch stops calling rtl_for_decl_init and instead
for cases for which rtl_for_decl_init does anything at all walks the
initializer and ensures referenced vars or functions are mangled.
2022-02-09 Jakub Jelinek <jakub@redhat.com>
PR debug/104407
* dwarf2out.cc (mangle_referenced_decls): New function.
(tree_add_const_value_attribute): Don't call rtl_for_decl_init if
early_dwarf. Instead walk the initializer and try to mangle vars or
functions referenced from it.
* g++.dg/debug/dwarf2/pr104407.C: New test.
Diff:
---
gcc/dwarf2out.cc | 44 +++++++++++++++++++++++-----
gcc/testsuite/g++.dg/debug/dwarf2/pr104407.C | 12 ++++++++
2 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc
index d1e8654e4d7..5681b01749a 100644
--- a/gcc/dwarf2out.cc
+++ b/gcc/dwarf2out.cc
@@ -20431,7 +20431,10 @@ rtl_for_decl_init (tree init, tree type)
}
}
/* Other aggregates, and complex values, could be represented using
- CONCAT: FIXME! */
+ CONCAT: FIXME!
+ If this changes, please adjust tree_add_const_value_attribute
+ so that for early_dwarf it will for such initializers mangle referenced
+ decls. */
else if (AGGREGATE_TYPE_P (type)
|| (TREE_CODE (init) == VIEW_CONVERT_EXPR
&& AGGREGATE_TYPE_P (TREE_TYPE (TREE_OPERAND (init, 0))))
@@ -20881,6 +20884,19 @@ add_location_or_const_value_attribute (dw_die_ref die, tree decl, bool cache_p)
return tree_add_const_value_attribute_for_decl (die, decl);
}
+/* Mangle referenced decls. */
+static tree
+mangle_referenced_decls (tree *tp, int *walk_subtrees, void *)
+{
+ if (! EXPR_P (*tp) && ! CONSTANT_CLASS_P (*tp))
+ *walk_subtrees = 0;
+
+ if (VAR_OR_FUNCTION_DECL_P (*tp))
+ assign_assembler_name_if_needed (*tp);
+
+ return NULL_TREE;
+}
+
/* Attach a DW_AT_const_value attribute to DIE. The value of the
attribute is the const value T. */
@@ -20889,7 +20905,6 @@ tree_add_const_value_attribute (dw_die_ref die, tree t)
{
tree init;
tree type = TREE_TYPE (t);
- rtx rtl;
if (!t || !TREE_TYPE (t) || TREE_TYPE (t) == error_mark_node)
return false;
@@ -20910,11 +20925,26 @@ tree_add_const_value_attribute (dw_die_ref die, tree t)
return true;
}
}
- /* Generate the RTL even if early_dwarf to force mangling of all refered to
- symbols. */
- rtl = rtl_for_decl_init (init, type);
- if (rtl && !early_dwarf)
- return add_const_value_attribute (die, TYPE_MODE (type), rtl);
+ if (!early_dwarf)
+ {
+ rtx rtl = rtl_for_decl_init (init, type);
+ if (rtl)
+ return add_const_value_attribute (die, TYPE_MODE (type), rtl);
+ }
+ else
+ {
+ /* For early_dwarf force mangling of all referenced symbols. */
+ tree initializer = init;
+ STRIP_NOPS (initializer);
+ /* rtl_for_decl_init punts on other aggregates, and complex values. */
+ if (AGGREGATE_TYPE_P (type)
+ || (TREE_CODE (initializer) == VIEW_CONVERT_EXPR
+ && AGGREGATE_TYPE_P (TREE_TYPE (TREE_OPERAND (initializer, 0))))
+ || TREE_CODE (type) == COMPLEX_TYPE)
+ ;
+ else if (initializer_constant_valid_p (initializer, type))
+ walk_tree (&initializer, mangle_referenced_decls, NULL, NULL);
+ }
/* If the host and target are sane, try harder. */
if (CHAR_BIT == 8 && BITS_PER_UNIT == 8
&& initializer_constant_valid_p (init, type))
diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/pr104407.C b/gcc/testsuite/g++.dg/debug/dwarf2/pr104407.C
new file mode 100644
index 00000000000..4752587459c
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/pr104407.C
@@ -0,0 +1,12 @@
+// PR debug/104407
+// { dg-do compile { target c++17 } }
+// { dg-options "-O1 -fcompare-debug" }
+
+struct A { int i; long j; int k : 2; char l; } a;
+
+auto [ aa, bb, cc, dd ] = a;
+
+namespace N
+{
+ auto & [ m, n, o, ppp ] = a;
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-02-09 14:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-09 14:19 [gcc r12-7129] dwarf2out: Don't call expand_expr during early_dwarf [PR104407] Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).