diff options
author | Richard Sandiford <richard.sandiford@arm.com> | 2020-07-13 13:47:39 +0100 |
---|---|---|
committer | Richard Sandiford <richard.sandiford@arm.com> | 2020-07-13 13:47:39 +0100 |
commit | 5834e96a08fd8b86a42428f38a95903d2f1de202 (patch) | |
tree | 4220917d019cb3cb16e40755f96f9e92ed4c7544 /gcc/tree-pretty-print.c | |
parent | ba8fe4b4832e30277f2e4a73b5d35b2e55074d07 (diff) | |
download | gcc-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-pretty-print.c')
-rw-r--r-- | gcc/tree-pretty-print.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |