From 3b834a2e0161ace8a7b494dfc6794d61ba200706 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 19 Oct 2016 12:48:46 +0200 Subject: [PATCH] [PR lto/77458] Avoid ICE in offloading with differing _FloatN, _FloatNx types gcc/ PR lto/77458 * tree-core.h (enum tree_index): Put the complex types after their component types. * tree-streamer.c (verify_common_node_recorded): New function. (preload_common_nodes) : Use it. From-SVN: r241338 --- gcc/ChangeLog | 8 ++++++++ gcc/tree-core.h | 31 +++++++++++++++++-------------- gcc/tree-streamer.c | 32 +++++++++++++++++++++++++++++++- 3 files changed, 56 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 59b00d164f9..b50e2e4004e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2016-10-19 Thomas Schwinge + + PR lto/77458 + * tree-core.h (enum tree_index): Put the complex types after their + component types. + * tree-streamer.c (verify_common_node_recorded): New function. + (preload_common_nodes) : Use it. + 2016-10-19 Martin Liska * cgraph.h (cgraph_edge::binds_to_current_def_p): diff --git a/gcc/tree-core.h b/gcc/tree-core.h index 1bfe6823610..3e3f31e2726 100644 --- a/gcc/tree-core.h +++ b/gcc/tree-core.h @@ -556,20 +556,6 @@ enum tree_index { TI_BOOLEAN_FALSE, TI_BOOLEAN_TRUE, - TI_COMPLEX_INTEGER_TYPE, - TI_COMPLEX_FLOAT_TYPE, - TI_COMPLEX_DOUBLE_TYPE, - TI_COMPLEX_LONG_DOUBLE_TYPE, - - TI_COMPLEX_FLOAT16_TYPE, - TI_COMPLEX_FLOATN_NX_TYPE_FIRST = TI_COMPLEX_FLOAT16_TYPE, - TI_COMPLEX_FLOAT32_TYPE, - TI_COMPLEX_FLOAT64_TYPE, - TI_COMPLEX_FLOAT128_TYPE, - TI_COMPLEX_FLOAT32X_TYPE, - TI_COMPLEX_FLOAT64X_TYPE, - TI_COMPLEX_FLOAT128X_TYPE, - TI_FLOAT_TYPE, TI_DOUBLE_TYPE, TI_LONG_DOUBLE_TYPE, @@ -599,6 +585,23 @@ enum tree_index { - TI_FLOATN_NX_TYPE_FIRST \ + 1) + /* Put the complex types after their component types, so that in (sequential) + tree streaming we can assert that their component types have already been + handled (see tree-streamer.c:record_common_node). */ + TI_COMPLEX_INTEGER_TYPE, + TI_COMPLEX_FLOAT_TYPE, + TI_COMPLEX_DOUBLE_TYPE, + TI_COMPLEX_LONG_DOUBLE_TYPE, + + TI_COMPLEX_FLOAT16_TYPE, + TI_COMPLEX_FLOATN_NX_TYPE_FIRST = TI_COMPLEX_FLOAT16_TYPE, + TI_COMPLEX_FLOAT32_TYPE, + TI_COMPLEX_FLOAT64_TYPE, + TI_COMPLEX_FLOAT128_TYPE, + TI_COMPLEX_FLOAT32X_TYPE, + TI_COMPLEX_FLOAT64X_TYPE, + TI_COMPLEX_FLOAT128X_TYPE, + TI_FLOAT_PTR_TYPE, TI_DOUBLE_PTR_TYPE, TI_LONG_DOUBLE_PTR_TYPE, diff --git a/gcc/tree-streamer.c b/gcc/tree-streamer.c index 2139e96634e..70054b1f2c1 100644 --- a/gcc/tree-streamer.c +++ b/gcc/tree-streamer.c @@ -248,6 +248,32 @@ streamer_tree_cache_lookup (struct streamer_tree_cache_d *cache, tree t, } +/* Verify that NODE is in CACHE. */ + +static void +verify_common_node_recorded (struct streamer_tree_cache_d *cache, tree node) +{ + /* Restrict this to flag_checking only because in general violating it is + harmless plus we never know what happens on all targets/frontend/flag(!) + combinations. */ + if (!flag_checking) + return; + + if (cache->node_map) + gcc_assert (streamer_tree_cache_lookup (cache, node, NULL)); + else + { + bool found = false; + gcc_assert (cache->nodes.exists ()); + /* Linear search... */ + for (unsigned i = 0; !found && i < cache->nodes.length (); ++i) + if (cache->nodes[i] == node) + found = true; + gcc_assert (found); + } +} + + /* Record NODE in CACHE. */ static void @@ -293,11 +319,15 @@ record_common_node (struct streamer_tree_cache_d *cache, tree node) /* No recursive trees. */ break; case ARRAY_TYPE: - case COMPLEX_TYPE: case POINTER_TYPE: case REFERENCE_TYPE: record_common_node (cache, TREE_TYPE (node)); break; + case COMPLEX_TYPE: + /* Verify that a complex type's component type (node_type) has been + handled already (and we thus don't need to recurse here). */ + verify_common_node_recorded (cache, TREE_TYPE (node)); + break; case RECORD_TYPE: /* The FIELD_DECLs of structures should be shared, so that every COMPONENT_REF uses the same tree node when referencing a field. -- 2.30.2