diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ipa-devirt.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.target/aarch64/pr95114.C | 3 | ||||
| -rw-r--r-- | gcc/tree-pretty-print.c | 5 | ||||
| -rw-r--r-- | gcc/tree.c | 7 | ||||
| -rw-r--r-- | gcc/tree.h | 4 |
5 files changed, 18 insertions, 10 deletions
diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 0340dec..3ab7049 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -1883,10 +1883,11 @@ add_type_duplicate (odr_type val, tree type) return build_bases; } -/* REF is OBJ_TYPE_REF, return the class the ref corresponds to. */ +/* REF is OBJ_TYPE_REF, return the class the ref corresponds to. + FOR_DUMP_P is true when being called from the dump routines. */ tree -obj_type_ref_class (const_tree ref) +obj_type_ref_class (const_tree ref, bool for_dump_p) { gcc_checking_assert (TREE_CODE (ref) == OBJ_TYPE_REF); ref = TREE_TYPE (ref); @@ -1902,8 +1903,10 @@ obj_type_ref_class (const_tree ref) tree ret = TREE_TYPE (ref); if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (ret)) ret = TYPE_CANONICAL (ret); + else if (odr_type ot = get_odr_type (ret, !for_dump_p)) + ret = ot->type; else - ret = get_odr_type (ret)->type; + gcc_assert (for_dump_p); return ret; } diff --git a/gcc/testsuite/g++.target/aarch64/pr95114.C b/gcc/testsuite/g++.target/aarch64/pr95114.C new file mode 100644 index 0000000..1689159 --- /dev/null +++ b/gcc/testsuite/g++.target/aarch64/pr95114.C @@ -0,0 +1,3 @@ +template<typename T> struct foo { virtual void f() = 0; }; +extern foo<__Int8x8_t> &x; +void f() { x.f(); } diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c index 4f50f37..be1ed90 100644 --- a/gcc/tree-pretty-print.c +++ b/gcc/tree-pretty-print.c @@ -3167,10 +3167,11 @@ dump_generic_node (pretty_printer *pp, tree node, int spc, dump_flags_t flags, libstdc++-prettyprinters/shared_ptr.cc with and without -g, for example, at occurrences of OBJ_TYPE_REF. */ if (!(flags & (TDF_SLIM | TDF_COMPARE_DEBUG)) - && virtual_method_call_p (node)) + && virtual_method_call_p (node, true)) { pp_string (pp, "("); - dump_generic_node (pp, obj_type_ref_class (node), spc, flags, false); + dump_generic_node (pp, obj_type_ref_class (node, true), + spc, flags, false); pp_string (pp, ")"); } dump_generic_node (pp, OBJ_TYPE_REF_OBJECT (node), spc, flags, false); @@ -12810,10 +12810,11 @@ lhd_gcc_personality (void) OBJ_TYPE_REF representing an virtual call of C++ method. (As opposed to OBJ_TYPE_REF representing objc calls through a cast where middle-end devirtualization machinery - can't apply.) */ + can't apply.) FOR_DUMP_P is true when being called from + the dump routines. */ bool -virtual_method_call_p (const_tree target) +virtual_method_call_p (const_tree target, bool for_dump_p) { if (TREE_CODE (target) != OBJ_TYPE_REF) return false; @@ -12826,7 +12827,7 @@ virtual_method_call_p (const_tree target) /* If we do not have BINFO associated, it means that type was built without devirtualization enabled. Do not consider this a virtual call. */ - if (!TYPE_BINFO (obj_type_ref_class (target))) + if (!TYPE_BINFO (obj_type_ref_class (target, for_dump_p))) return false; return true; } @@ -5241,8 +5241,8 @@ extern location_t *block_nonartificial_location (tree); extern location_t tree_nonartificial_location (tree); extern tree block_ultimate_origin (const_tree); extern tree get_binfo_at_offset (tree, poly_int64, tree); -extern bool virtual_method_call_p (const_tree); -extern tree obj_type_ref_class (const_tree ref); +extern bool virtual_method_call_p (const_tree, bool = false); +extern tree obj_type_ref_class (const_tree ref, bool = false); extern bool types_same_for_odr (const_tree type1, const_tree type2); extern bool contains_bitfld_component_ref_p (const_tree); extern bool block_may_fallthru (const_tree); |