diff options
| -rw-r--r-- | gcc/ipa-devirt.c | 2 | ||||
| -rw-r--r-- | gcc/ipa-utils.h | 2 | ||||
| -rw-r--r-- | gcc/lto/lto-common.c | 5 | ||||
| -rw-r--r-- | gcc/tree-streamer-out.c | 6 |
4 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 067ed5b..6e6df0b2 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -2032,6 +2032,8 @@ odr_based_tbaa_p (const_tree type) { if (!RECORD_OR_UNION_TYPE_P (type)) return false; + if (!odr_hash) + return false; odr_type t = get_odr_type (const_cast <tree> (type), false); if (!t || !t->tbaa_enabled) return false; diff --git a/gcc/ipa-utils.h b/gcc/ipa-utils.h index 880e527..91571d8 100644 --- a/gcc/ipa-utils.h +++ b/gcc/ipa-utils.h @@ -211,8 +211,6 @@ type_with_linkage_p (const_tree t) if (!TYPE_CONTEXT (t)) return false; - gcc_checking_assert (TREE_CODE (t) == ENUMERAL_TYPE || TYPE_CXX_ODR_P (t)); - return true; } diff --git a/gcc/lto/lto-common.c b/gcc/lto/lto-common.c index 6944c46..0a3033c 100644 --- a/gcc/lto/lto-common.c +++ b/gcc/lto/lto-common.c @@ -415,8 +415,8 @@ gimple_register_canonical_type_1 (tree t, hashval_t hash) that we can use to lookup structurally equivalent non-ODR type. In case we decide to treat type as unique ODR type we recompute hash based on name and let TBAA machinery know about our decision. */ - if (RECORD_OR_UNION_TYPE_P (t) - && odr_type_p (t) && !odr_type_violation_reported_p (t)) + if (RECORD_OR_UNION_TYPE_P (t) && odr_type_p (t) + && TYPE_CXX_ODR_P (t) && !odr_type_violation_reported_p (t)) { /* Anonymous namespace types never conflict with non-C++ types. */ if (type_with_linkage_p (t) && type_in_anonymous_namespace_p (t)) @@ -434,6 +434,7 @@ gimple_register_canonical_type_1 (tree t, hashval_t hash) if (slot && !TYPE_CXX_ODR_P (*(tree *)slot)) { tree nonodr = *(tree *)slot; + gcc_checking_assert (!flag_ltrans); if (symtab->dump_file) { fprintf (symtab->dump_file, diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c index d7a451cf..9383cc4 100644 --- a/gcc/tree-streamer-out.c +++ b/gcc/tree-streamer-out.c @@ -343,7 +343,11 @@ pack_ts_type_common_value_fields (struct bitpack_d *bp, tree expr) { bp_pack_value (bp, TYPE_TRANSPARENT_AGGR (expr), 1); bp_pack_value (bp, TYPE_FINAL_P (expr), 1); - bp_pack_value (bp, TYPE_CXX_ODR_P (expr), 1); + /* alias_ptr_types_compatible_p relies on fact that during LTO + types do not get refined from WPA time to ltrans. */ + bp_pack_value (bp, flag_wpa && TYPE_CANONICAL (expr) + ? TYPE_CXX_ODR_P (TYPE_CANONICAL (expr)) + : TYPE_CXX_ODR_P (expr), 1); } else if (TREE_CODE (expr) == ARRAY_TYPE) bp_pack_value (bp, TYPE_NONALIASED_COMPONENT (expr), 1); |