procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PR lto/77458] Avoid ICE in offloading with differing _FloatN, _FloatNx types

Browse source 
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) <TREE_CODE (node) == COMPLEX_TYPE>: Use it.

From-SVN: r241338
This commit is contained in:
Thomas Schwinge 2016-10-19 12:48:46 +02:00 • committed by Thomas Schwinge
parent aff98801ac
commit 3b834a2e01
3 changed files with 56 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/ChangeLog
View file

@ -1,3 +1,11 @@
2016-10-19 Thomas Schwinge <thomas@codesourcery.com>
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) <TREE_CODE (node) == COMPLEX_TYPE>: Use it.
2016-10-19 Martin Liska <mliska@suse.cz>
* cgraph.h (cgraph_edge::binds_to_current_def_p):

31
gcc/tree-core.h
View file

@ -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,

32
gcc/tree-streamer.c
View file

@ -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.