public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-2952] don't access cfun in dump_function_to_file
@ 2021-08-17 11:01 Alexandre Oliva
0 siblings, 0 replies; only message in thread
From: Alexandre Oliva @ 2021-08-17 11:01 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:3ed8da759b52708f6874af2afc6ab56b1fb00cec
commit r12-2952-g3ed8da759b52708f6874af2afc6ab56b1fb00cec
Author: Alexandre Oliva <oliva@adacore.com>
Date: Sat Jul 24 23:05:32 2021 -0300
don't access cfun in dump_function_to_file
dump_function_to_file takes the function to dump as a parameter, and
parts of it use the local fun variable where cfun would be used
elsewhere. Others use cfun, presumably in error. Fixed to use fun
uniformly. Added a few more tests for non-NULL fun before
dereferencing it.
for gcc/ChangeLog
* tree-cfg.c (dump_function_to_file): Use fun, not cfun.
Diff:
---
gcc/tree-cfg.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 9883eaaa9bf..61b53913e0b 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -8075,9 +8075,9 @@ dump_function_to_file (tree fndecl, FILE *file, dump_flags_t flags)
: (fun->curr_properties & PROP_cfg) ? "cfg"
: "");
- if (cfun->cfg)
+ if (fun && fun->cfg)
{
- basic_block bb = ENTRY_BLOCK_PTR_FOR_FN (cfun);
+ basic_block bb = ENTRY_BLOCK_PTR_FOR_FN (fun);
if (bb->count.initialized_p ())
fprintf (file, ",%s(%" PRIu64 ")",
profile_quality_as_string (bb->count.quality ()),
@@ -8163,8 +8163,8 @@ dump_function_to_file (tree fndecl, FILE *file, dump_flags_t flags)
tree name;
- if (gimple_in_ssa_p (cfun))
- FOR_EACH_SSA_NAME (ix, name, cfun)
+ if (gimple_in_ssa_p (fun))
+ FOR_EACH_SSA_NAME (ix, name, fun)
{
if (!SSA_NAME_VAR (name)
/* SSA name with decls without a name still get
@@ -8200,7 +8200,7 @@ dump_function_to_file (tree fndecl, FILE *file, dump_flags_t flags)
fprintf (file, "}\n");
}
- else if (fun->curr_properties & PROP_gimple_any)
+ else if (fun && (fun->curr_properties & PROP_gimple_any))
{
/* The function is now in GIMPLE form but the CFG has not been
built yet. Emit the single sequence of GIMPLE statements
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-17 11:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-17 11:01 [gcc r12-2952] don't access cfun in dump_function_to_file Alexandre Oliva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).