aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree.c
diff options
context:
space:
mode:
authorRichard Sandiford <richard.sandiford@arm.com>2020-07-13 13:47:39 +0100
committerRichard Sandiford <richard.sandiford@arm.com>2020-07-13 13:47:39 +0100
commit5834e96a08fd8b86a42428f38a95903d2f1de202 (patch)
tree4220917d019cb3cb16e40755f96f9e92ed4c7544 /gcc/tree.c
parentba8fe4b4832e30277f2e4a73b5d35b2e55074d07 (diff)
downloadgcc-5834e96a08fd8b86a42428f38a95903d2f1de202.zip
gcc-5834e96a08fd8b86a42428f38a95903d2f1de202.tar.gz
gcc-5834e96a08fd8b86a42428f38a95903d2f1de202.tar.bz2
ipa-devirt: Fix crash in obj_type_ref_class [PR95114]
The testcase has failed since r9-5035, because obj_type_ref_class tries to look up an ODR type when no ODR type information is available. (The information was available earlier in the compilation, but was freed during pass_ipa_free_lang_data.) We then crash dereferencing the null get_odr_type result. The test passes with -O2. However, it fails again if -fdump-tree-all is used, since obj_type_ref_class is called indirectly from the dump routines. Other code creates ODR type entries on the fly by passing “true” as the insert parameter. But obj_type_ref_class can't do that unconditionally, since it should have no side-effects when used from the dumping code. Following a suggestion from Honza, this patch adds parameters to say whether the routines are being called from dump routines and uses those to derive the insert parameter. gcc/ PR middle-end/95114 * tree.h (virtual_method_call_p): Add a default-false parameter that indicates whether the function is being called from dump routines. (obj_type_ref_class): Likewise. * tree.c (virtual_method_call_p): Likewise. * ipa-devirt.c (obj_type_ref_class): Likewise. Lazily add ODR type information for the type when the parameter is false. * tree-pretty-print.c (dump_generic_node): Update calls to virtual_method_call_p and obj_type_ref_class accordingly. gcc/testsuite/ PR middle-end/95114 * g++.target/aarch64/pr95114.C: New test.
Diffstat (limited to 'gcc/tree.c')
-rw-r--r--gcc/tree.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/gcc/tree.c b/gcc/tree.c
index 342da55..3d9968f 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -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;
}