[gcc r11-11142] middle-end/111818 - failed DECL_NOT_GIMPLE_REG_P setting of volatile

[Richard Biener]

https://gcc.gnu.org/g:45c296f2d81f6259e268e07707b4aa87dffba20a

commit r11-11142-g45c296f2d81f6259e268e07707b4aa87dffba20a
Author: Richard Biener <rguenther@suse.de>
Date:   Mon Oct 16 12:50:46 2023 +0200

    middle-end/111818 - failed DECL_NOT_GIMPLE_REG_P setting of volatile
    
    The following addresses a missed DECL_NOT_GIMPLE_REG_P setting of
    a volatile declared parameter which causes inlining to substitute
    a constant parameter into a context where its address is required.
    
    The main issue is in update_address_taken which clears
    DECL_NOT_GIMPLE_REG_P from the parameter but fails to rewrite it
    because is_gimple_reg returns false for volatiles.  The following
    changes maybe_optimize_var to make the 1:1 correspondence between
    clearing DECL_NOT_GIMPLE_REG_P of a register typed decl and
    actually rewriting it to SSA.
    
            PR middle-end/111818
            * tree-ssa.c (maybe_optimize_var): When clearing
            DECL_NOT_GIMPLE_REG_P always rewrite into SSA.
    
            * gcc.dg/torture/pr111818.c: New testcase.
    
    (cherry picked from commit ce55521bcd149fdc431f1d78e706b66d470210ae)

Diff:
---
 gcc/testsuite/gcc.dg/torture/pr111818.c | 11 +++++++++++
 gcc/tree-ssa.c                          | 17 +++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/torture/pr111818.c b/gcc/testsuite/gcc.dg/torture/pr111818.c
new file mode 100644
index 00000000000..a7a91111d71
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr111818.c
@@ -0,0 +1,11 @@
+/* { dg-do compile } */
+
+static void foo(const volatile unsigned int x, void *p)
+{
+  __builtin_memcpy(p, (void *)&x, sizeof x);
+}
+
+void bar(void *number)
+{
+  foo(0, number);
+}
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 41959ca03f8..dd3b65a0f67 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -1644,15 +1644,20 @@ maybe_optimize_var (tree var, bitmap addresses_taken, bitmap not_reg_needs,
 	  maybe_reg = true;
 	  DECL_NOT_GIMPLE_REG_P (var) = 0;
 	}
-      if (maybe_reg && is_gimple_reg (var))
+      if (maybe_reg)
 	{
-	  if (dump_file)
+	  if (is_gimple_reg (var))
 	    {
-	      fprintf (dump_file, "Now a gimple register: ");
-	      print_generic_expr (dump_file, var);
-	      fprintf (dump_file, "\n");
+	      if (dump_file)
+		{
+		  fprintf (dump_file, "Now a gimple register: ");
+		  print_generic_expr (dump_file, var);
+		  fprintf (dump_file, "\n");
+		}
+	      bitmap_set_bit (suitable_for_renaming, DECL_UID (var));
 	    }
-	  bitmap_set_bit (suitable_for_renaming, DECL_UID (var));
+	  else
+	    DECL_NOT_GIMPLE_REG_P (var) = 1;
 	}
     }
 }