aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-streamer-in.c
diff options
context:
space:
mode:
authorJan Hubicka <hubicka@ucw.cz>2014-07-01 00:18:25 +0200
committerJan Hubicka <hubicka@gcc.gnu.org>2014-06-30 22:18:25 +0000
commit010f4e272f4edf8a0ba24f6cb5d2e084c0c9a33c (patch)
treece37885e67fa8bfe2a2d91dc28440fe76b1ba05b /gcc/tree-streamer-in.c
parent0ca59830558c865ea8329e387207d9682021f405 (diff)
downloadgcc-010f4e272f4edf8a0ba24f6cb5d2e084c0c9a33c.zip
gcc-010f4e272f4edf8a0ba24f6cb5d2e084c0c9a33c.tar.gz
gcc-010f4e272f4edf8a0ba24f6cb5d2e084c0c9a33c.tar.bz2
revert: tree-streamer-out.c (pack_ts_type_common_value_fields): Stream if type is complete.
Revert: * tree-streamer-out.c (pack_ts_type_common_value_fields): Stream if type is complete. (write_ts_type_common_tree_pointers): Do not stream fields not set for incomplete types; do not stream duplicated fields for variants; sanity check that variant and type match. (write_ts_type_non_common_tree_pointers): Likewise. * tree-streamer-in.c (unpack_ts_type_common_value_fields): Mark in TYPE_SIZE whether type is complete. (lto_input_ts_type_common_tree_pointers): Do same changes as in write_ts_type_common_tree_pointers (lto_input_ts_type_non_common_tree_pointers): Likewise. * lto.c (lto_copy_fields_not_streamed): New function. (compare_tree_sccs_1): Do not compare fields shared in between type and variant. (lto_read_decls): Fixup types first before inserting into hash. From-SVN: r212179
Diffstat (limited to 'gcc/tree-streamer-in.c')
-rw-r--r--gcc/tree-streamer-in.c80
1 files changed, 18 insertions, 62 deletions
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index 93d3060..ee1c955 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -357,13 +357,6 @@ unpack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr)
TYPE_RESTRICT (expr) = (unsigned) bp_unpack_value (bp, 1);
TYPE_USER_ALIGN (expr) = (unsigned) bp_unpack_value (bp, 1);
TYPE_READONLY (expr) = (unsigned) bp_unpack_value (bp, 1);
- /* This bit represent if type is complete, or if the TYPE_SIZE
- is non-NULL. Mark this fact into TYPE_SIZE. The actual values
- will be filled in later. */
- if ((unsigned) bp_unpack_value (bp, 1))
- TYPE_SIZE (expr) = error_mark_node;
- else
- TYPE_SIZE (expr) = NULL_TREE;
TYPE_PRECISION (expr) = bp_unpack_var_len_unsigned (bp);
TYPE_ALIGN (expr) = bp_unpack_var_len_unsigned (bp);
TYPE_ALIAS_SET (expr) = bp_unpack_var_len_int (bp);
@@ -801,29 +794,19 @@ static void
lto_input_ts_type_common_tree_pointers (struct lto_input_block *ib,
struct data_in *data_in, tree expr)
{
- TYPE_MAIN_VARIANT (expr) = stream_read_tree (ib, data_in);
-
- /* Variants share most the properties with the main variant. */
- if (TYPE_MAIN_VARIANT (expr) == expr)
- {
- if (COMPLETE_TYPE_P (expr))
- {
- TYPE_SIZE (expr) = stream_read_tree (ib, data_in);
- TYPE_SIZE_UNIT (expr) = stream_read_tree (ib, data_in);
- }
- TYPE_ATTRIBUTES (expr) = stream_read_tree (ib, data_in);
- }
- /* The fileds not streamed will be copied by
- lto_copy_fields_not_streamed. */
+ TYPE_SIZE (expr) = stream_read_tree (ib, data_in);
+ TYPE_SIZE_UNIT (expr) = stream_read_tree (ib, data_in);
+ TYPE_ATTRIBUTES (expr) = stream_read_tree (ib, data_in);
TYPE_NAME (expr) = stream_read_tree (ib, data_in);
- TYPE_CONTEXT (expr) = stream_read_tree (ib, data_in);
- TYPE_STUB_DECL (expr) = stream_read_tree (ib, data_in);
/* Do not stream TYPE_POINTER_TO or TYPE_REFERENCE_TO. They will be
reconstructed during fixup. */
/* Do not stream TYPE_NEXT_VARIANT, we reconstruct the variant lists
during fixup. */
+ TYPE_MAIN_VARIANT (expr) = stream_read_tree (ib, data_in);
+ TYPE_CONTEXT (expr) = stream_read_tree (ib, data_in);
/* TYPE_CANONICAL gets re-computed during type merging. */
TYPE_CANONICAL (expr) = NULL_TREE;
+ TYPE_STUB_DECL (expr) = stream_read_tree (ib, data_in);
}
/* Read all pointer fields in the TS_TYPE_NON_COMMON structure of EXPR
@@ -835,48 +818,21 @@ lto_input_ts_type_non_common_tree_pointers (struct lto_input_block *ib,
struct data_in *data_in,
tree expr)
{
- if (TYPE_MAIN_VARIANT (expr) == expr)
- {
- if (TREE_CODE (expr) == ENUMERAL_TYPE && COMPLETE_TYPE_P (expr))
- TYPE_VALUES (expr) = stream_read_tree (ib, data_in);
- else if (TREE_CODE (expr) == ARRAY_TYPE)
- TYPE_DOMAIN (expr) = stream_read_tree (ib, data_in);
-
- /* TYPE_NEXT_PTR_TO and TYPE_NEXT_REF_TO is recomputed. */
- if (RECORD_OR_UNION_TYPE_P (expr) && COMPLETE_TYPE_P (expr))
- TYPE_VFIELD (expr) = stream_read_tree (ib, data_in);
- else if ((TREE_CODE (expr) == ENUMERAL_TYPE && COMPLETE_TYPE_P (expr))
- || TREE_CODE (expr) == INTEGER_TYPE
- || TREE_CODE (expr) == BOOLEAN_TYPE
- || TREE_CODE (expr) == REAL_TYPE
- || TREE_CODE (expr) == FIXED_POINT_TYPE)
- TYPE_MIN_VALUE (expr) = stream_read_tree (ib, data_in);
-
- if (TREE_CODE (expr) == METHOD_TYPE)
- TYPE_METHOD_BASETYPE (expr) = stream_read_tree (ib, data_in);
- else if (RECORD_OR_UNION_TYPE_P (expr) && COMPLETE_TYPE_P (expr))
- TYPE_METHODS (expr) = stream_read_tree (ib, data_in);
- else if (TREE_CODE (expr) == OFFSET_TYPE)
- TYPE_OFFSET_BASETYPE (expr) = stream_read_tree (ib, data_in);
- else if (TREE_CODE (expr) == ARRAY_TYPE)
- TYPE_ARRAY_MAX_SIZE (expr) = stream_read_tree (ib, data_in);
- else if ((TREE_CODE (expr) == ENUMERAL_TYPE && COMPLETE_TYPE_P (expr))
- || TREE_CODE (expr) == INTEGER_TYPE
- || TREE_CODE (expr) == BOOLEAN_TYPE
- || TREE_CODE (expr) == REAL_TYPE
- || TREE_CODE (expr) == FIXED_POINT_TYPE)
- TYPE_MAX_VALUE (expr) = stream_read_tree (ib, data_in);
-
- if (RECORD_OR_UNION_TYPE_P (expr) && COMPLETE_TYPE_P (expr))
- TYPE_BINFO (expr) = stream_read_tree (ib, data_in);
- }
- /* The fileds not streamed will be copied by
- lto_copy_fields_not_streamed. */
- if (RECORD_OR_UNION_TYPE_P (expr) && COMPLETE_TYPE_P (expr))
+ if (TREE_CODE (expr) == ENUMERAL_TYPE)
+ TYPE_VALUES (expr) = stream_read_tree (ib, data_in);
+ else if (TREE_CODE (expr) == ARRAY_TYPE)
+ TYPE_DOMAIN (expr) = stream_read_tree (ib, data_in);
+ else if (RECORD_OR_UNION_TYPE_P (expr))
TYPE_FIELDS (expr) = streamer_read_chain (ib, data_in);
else if (TREE_CODE (expr) == FUNCTION_TYPE
- || TREE_CODE (expr) == METHOD_TYPE)
+ || TREE_CODE (expr) == METHOD_TYPE)
TYPE_ARG_TYPES (expr) = stream_read_tree (ib, data_in);
+
+ if (!POINTER_TYPE_P (expr))
+ TYPE_MINVAL (expr) = stream_read_tree (ib, data_in);
+ TYPE_MAXVAL (expr) = stream_read_tree (ib, data_in);
+ if (RECORD_OR_UNION_TYPE_P (expr))
+ TYPE_BINFO (expr) = stream_read_tree (ib, data_in);
}