diff options
| author | Jan Hubicka <jh@suse.cz> | 2019-06-24 23:13:12 +0200 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2019-06-24 21:13:12 +0000 |
| commit | f4af4019dfb79f92adcf7cee4ef9e5f6ff428a37 (patch) | |
| tree | 2344514a98c3312cba34b09afe63f6f1962da351 /gcc/tree.c | |
| parent | cd57f4d81bdefeca6133dc52db8b7832a867686b (diff) | |
| download | gcc-f4af4019dfb79f92adcf7cee4ef9e5f6ff428a37.zip gcc-f4af4019dfb79f92adcf7cee4ef9e5f6ff428a37.tar.gz gcc-f4af4019dfb79f92adcf7cee4ef9e5f6ff428a37.tar.bz2 | |
ipa-utils.h (type_with_linkage_p): Verify that type is CXX_ODR_P.
* ipa-utils.h (type_with_linkage_p): Verify that type is
CXX_ODR_P.
(odr_type_p): Remove extra return.
* lto-streamer-out.c (hash_tree): Hash TYPE_CXX_ODR_P;
hash STRING_FLAG only for arrays and integers.
* tree-stremaer-in.c (unpack_ts_type_common_value_fields):
Update analogously.
* tree-streamer-out.c (pack_ts_type_common_value_fields):
Likewise.
* print-tree.c (print_node): Print cxx-odr-p
and string-flag.
* tree.c (need_assembler_name_p): Also check that type
is CXX_ODR_TYPE_P
(verify_type_variant): Update verification of SRING_FLAG;
also check CXX_ODR_P.
* tree.h (ARRAY_OR_INTEGER_TYPE_CHECK): New macro.
(TYPE_STRING_FLAG): Use it.
(TYPE_CXX_ODR_P): New macro.
* lto-common.c (compare_tree_sccs_1): Compare CXX_ODR_P;
compare STRING_FLAG only for arrays and integers.
* gcc-interface/decl.c (gnat_to_gnu_entity): Check that
type is array or integer prior checking string flag.
* gcc-interface/gigi.h (gnat_signed_type_for,
maybe_character_value): Likewise.
* c-common.c (braced_lists_to_strings): Check that
type is array or integer prior checking string flag.
* lex.c (cxx_make_type): Set TYPE_CXX_ODR_P.
* dwarf2out.c (gen_array_type_die): First check that type
is an array and then test string flag.
* trans-expr.c (gfc_conv_substring): Check that
type is array or integer prior checking string flag.
(gfc_conv_string_parameter): Likewise.
* trans-openmp.c (gfc_omp_scalar_p): Likewise.
* trans.c (gfc_build_array_ref): Likewise.
From-SVN: r272628
Diffstat (limited to 'gcc/tree.c')
| -rw-r--r-- | gcc/tree.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -5598,6 +5598,9 @@ need_assembler_name_p (tree decl) && decl == TYPE_NAME (TREE_TYPE (decl)) && TYPE_MAIN_VARIANT (TREE_TYPE (decl)) == TREE_TYPE (decl) && !TYPE_ARTIFICIAL (TREE_TYPE (decl)) + && ((TREE_CODE (TREE_TYPE (decl)) != RECORD_TYPE + && TREE_CODE (TREE_TYPE (decl)) != UNION_TYPE) + || TYPE_CXX_ODR_P (TREE_TYPE (decl))) && (type_with_linkage_p (TREE_TYPE (decl)) || TREE_CODE (TREE_TYPE (decl)) == INTEGER_TYPE) && !variably_modified_type_p (TREE_TYPE (decl), NULL_TREE)) @@ -13881,7 +13884,10 @@ verify_type_variant (const_tree t, tree tv) Ada also builds variants of types with different TYPE_CONTEXT. */ if ((!in_lto_p || !TYPE_FILE_SCOPE_P (t)) && 0) verify_variant_match (TYPE_CONTEXT); - verify_variant_match (TYPE_STRING_FLAG); + if (TREE_CODE (t) == ARRAY_TYPE || TREE_CODE (t) == INTEGER_TYPE) + verify_variant_match (TYPE_STRING_FLAG); + if (TREE_CODE (t) == RECORD_TYPE || TREE_CODE (t) == UNION_TYPE) + verify_variant_match (TYPE_CXX_ODR_P); if (TYPE_ALIAS_SET_KNOWN_P (t)) { error ("type variant with %<TYPE_ALIAS_SET_KNOWN_P%>"); @@ -14627,12 +14633,6 @@ verify_type (const_tree t) error ("%<TYPE_CACHED_VALUES_P%> is set while it should not be"); error_found = true; } - if (TYPE_STRING_FLAG (t) - && TREE_CODE (t) != ARRAY_TYPE && TREE_CODE (t) != INTEGER_TYPE) - { - error ("%<TYPE_STRING_FLAG%> is set on wrong type code"); - error_found = true; - } /* ipa-devirt makes an assumption that TYPE_METHOD_BASETYPE is always TYPE_MAIN_VARIANT and it would be odd to add methods only to variatns |