stor-layout.c (layout_type): Move setting complex MODE to layout_type...

[gcc]
2016-06-21  Michael Meissner  <meissner@linux.vnet.ibm.com>

	* stor-layout.c (layout_type): Move setting complex MODE to
	layout_type, instead of setting it ahead of time by the caller.
	* tree.c (build_complex_type): Likewise.

[gcc/fortran]
2016-06-21  Michael Meissner  <meissner@linux.vnet.ibm.com>

	* trans-types.c (gfc_build_complex_type): Move setting complex
	MODE to layout_type, instead of setting it ahead of time by the
	caller.

From-SVN: r237657
This commit is contained in:
Michael Meissner 2016-06-21 20:57:20 +00:00 committed by Michael Meissner
parent 63617e3015
commit 5cd0a74a91
5 changed files with 14 additions and 8 deletions

View File

@ -1,3 +1,9 @@
2016-06-21 Michael Meissner <meissner@linux.vnet.ibm.com>
* stor-layout.c (layout_type): Move setting complex MODE to
layout_type, instead of setting it ahead of time by the caller.
* tree.c (build_complex_type): Likewise.
2016-06-21 Martin Liska <mliska@suse.cz>
* predict.c (force_edge_cold): Replace imposisble with

View File

@ -1,3 +1,9 @@
2016-06-21 Michael Meissner <meissner@linux.vnet.ibm.com>
* trans-types.c (gfc_build_complex_type): Move setting complex
MODE to layout_type, instead of setting it ahead of time by the
caller.
2016-06-21 Tobias Burnus <burnus@net-b.de>
PR fortran/71068

View File

@ -828,7 +828,6 @@ gfc_build_complex_type (tree scalar_type)
new_type = make_node (COMPLEX_TYPE);
TREE_TYPE (new_type) = scalar_type;
SET_TYPE_MODE (new_type, GET_MODE_COMPLEX_MODE (TYPE_MODE (scalar_type)));
layout_type (new_type);
return new_type;
}

View File

@ -2146,12 +2146,8 @@ layout_type (tree type)
case COMPLEX_TYPE:
TYPE_UNSIGNED (type) = TYPE_UNSIGNED (TREE_TYPE (type));
/* build_complex_type and fortran's gfc_build_complex_type have set the
expected mode to allow having multiple complex types for multiple
floating point types that have the same size such as the PowerPC with
__ibm128 and __float128. */
gcc_assert (TYPE_MODE (type) != VOIDmode);
SET_TYPE_MODE (type,
GET_MODE_COMPLEX_MODE (TYPE_MODE (TREE_TYPE (type))));
TYPE_SIZE (type) = bitsize_int (GET_MODE_BITSIZE (TYPE_MODE (type)));
TYPE_SIZE_UNIT (type) = size_int (GET_MODE_SIZE (TYPE_MODE (type)));

View File

@ -8783,7 +8783,6 @@ build_complex_type (tree component_type)
t = make_node (COMPLEX_TYPE);
TREE_TYPE (t) = TYPE_MAIN_VARIANT (component_type);
SET_TYPE_MODE (t, GET_MODE_COMPLEX_MODE (TYPE_MODE (component_type)));
/* If we already have such a type, use the old one. */
hstate.add_object (TYPE_HASH (component_type));