don't access cfun in dump_function_to_file

don't access cfun in dump_function_to_file

[Alexandre Oliva]

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.

Regstrapped on x86_64-linux-gnu.  Ok to install?


for  gcc/ChangeLog

	* tree-cfg.c (dump_function_to_file): Use fun, not cfun.
---
 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 30b1b56293e3b..38269a27b7978 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -8074,9 +8074,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 ()),
@@ -8162,8 +8162,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
@@ -8199,7 +8199,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

-- 
Alexandre Oliva, happy hacker                https://FSFLA.org/blogs/lxo/
   Free Software Activist                       GNU Toolchain Engineer
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about <https://stallmansupport.org>

Re: don't access cfun in dump_function_to_file

[Richard Biener]

On Wed, Jul 28, 2021 at 10:12 AM Alexandre Oliva <oliva@adacore.com> wrote:
>
>
> 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.
>
> Regstrapped on x86_64-linux-gnu.  Ok to install?

OK.

Richard.

>
> for  gcc/ChangeLog
>
>         * tree-cfg.c (dump_function_to_file): Use fun, not cfun.
> ---
>  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 30b1b56293e3b..38269a27b7978 100644
> --- a/gcc/tree-cfg.c
> +++ b/gcc/tree-cfg.c
> @@ -8074,9 +8074,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 ()),
> @@ -8162,8 +8162,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
> @@ -8199,7 +8199,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
>
> --
> Alexandre Oliva, happy hacker                https://FSFLA.org/blogs/lxo/
>    Free Software Activist                       GNU Toolchain Engineer
> Disinformation flourishes because many people care deeply about injustice
> but very few check the facts.  Ask me about <https://stallmansupport.org>

Re: don't access cfun in dump_function_to_file

[Alexandre Oliva]

On Jul 28, 2021, Richard Biener <richard.guenther@gmail.com> wrote:

> OK.

Thanks, I've finally put this in as well.

>> * tree-cfg.c (dump_function_to_file): Use fun, not cfun.

-- 
Alexandre Oliva, happy hacker                https://FSFLA.org/blogs/lxo/
   Free Software Activist                       GNU Toolchain Engineer
Disinformation flourishes because many people care deeply about injustice
but very few check the facts.  Ask me about <https://stallmansupport.org>