From 2e33e1c46fae2695b076585af87d7844e19c3486 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 11 Oct 2016 08:05:31 +0000 Subject: [PATCH] tree.h (build_complex_type): Add second parameter with default. * tree.h (build_complex_type): Add second parameter with default. * tree.c (build_complex_type): Add NAMED second parameter and adjust recursive call. Create a TYPE_DECL only if NAMED is true. (build_common_tree_nodes): Pass true in calls to build_complex_type. From-SVN: r240967 --- gcc/ChangeLog | 7 +++++++ gcc/tree.c | 22 ++++++++++++++-------- gcc/tree.h | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8dbf87c884c..23f3b4dca80 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2016-10-11 Eric Botcazou + + * tree.h (build_complex_type): Add second parameter with default. + * tree.c (build_complex_type): Add NAMED second parameter and adjust + recursive call. Create a TYPE_DECL only if NAMED is true. + (build_common_tree_nodes): Pass true in calls to build_complex_type. + 2016-10-11 Georg-Johann Lay New avr-passes.def to register AVR specific passes. diff --git a/gcc/tree.c b/gcc/tree.c index 949d2ebe7ef..a3a8f0a307c 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -8752,10 +8752,15 @@ build_offset_type (tree basetype, tree type) return t; } -/* Create a complex type whose components are COMPONENT_TYPE. */ +/* Create a complex type whose components are COMPONENT_TYPE. + + If NAMED is true, the type is given a TYPE_NAME. We do not always + do so because this creates a DECL node and thus make the DECL_UIDs + dependent on the type canonicalization hashtable, which is GC-ed, + so the DECL_UIDs would not be stable wrt garbage collection. */ tree -build_complex_type (tree component_type) +build_complex_type (tree component_type, bool named) { tree t; inchash::hash hstate; @@ -8782,11 +8787,11 @@ build_complex_type (tree component_type) SET_TYPE_STRUCTURAL_EQUALITY (t); else if (TYPE_CANONICAL (component_type) != component_type) TYPE_CANONICAL (t) - = build_complex_type (TYPE_CANONICAL (component_type)); + = build_complex_type (TYPE_CANONICAL (component_type), named); } /* We need to create a name, since complex is a fundamental type. */ - if (! TYPE_NAME (t)) + if (!TYPE_NAME (t) && named) { const char *name; if (component_type == char_type_node) @@ -10372,10 +10377,11 @@ build_common_tree_nodes (bool signed_char) SET_TYPE_MODE (dfloat128_type_node, TDmode); dfloat128_ptr_type_node = build_pointer_type (dfloat128_type_node); - complex_integer_type_node = build_complex_type (integer_type_node); - complex_float_type_node = build_complex_type (float_type_node); - complex_double_type_node = build_complex_type (double_type_node); - complex_long_double_type_node = build_complex_type (long_double_type_node); + complex_integer_type_node = build_complex_type (integer_type_node, true); + complex_float_type_node = build_complex_type (float_type_node, true); + complex_double_type_node = build_complex_type (double_type_node, true); + complex_long_double_type_node = build_complex_type (long_double_type_node, + true); for (i = 0; i < NUM_FLOATN_NX_TYPES; i++) { diff --git a/gcc/tree.h b/gcc/tree.h index 563e6d9e287..30c643968de 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -4042,7 +4042,7 @@ extern tree build_varargs_function_type_array (tree, int, tree *); extern tree build_method_type_directly (tree, tree, tree); extern tree build_method_type (tree, tree); extern tree build_offset_type (tree, tree); -extern tree build_complex_type (tree); +extern tree build_complex_type (tree, bool named = false); extern tree array_type_nelts (const_tree); extern tree value_member (tree, tree); -- 2.30.2