tree-ssa-sccvn.c (vn_reference_lookup_3): Valueize MEM_REF base.

2019-09-24  Richard Biener  <rguenther@suse.de>

	* tree-ssa-sccvn.c (vn_reference_lookup_3): Valueize MEM_REF
	base.

	* gcc.dg/torture/20190924-1.c: New testcase.

From-SVN: r276092

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91efa76..bd6f541 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2019-09-24  Richard Biener  <rguenther@suse.de>
+
+       * tree-ssa-sccvn.c (vn_reference_lookup_3): Valueize MEM_REF
+       base.
+
 2019-09-23  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/arm/t-arm (arm-builtins.o): Add dependency on

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d4ec00e..600901d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2019-09-24  Richard Biener  <rguenther@suse.de>
+
+       * gcc.dg/torture/20190924-1.c: New testcase.
+
 2019-09-23  Maciej W. Rozycki  <macro@wdc.com>
 
        * lib/gnat.exp (gnat_target_compile): Pass the `ada' option to

diff --git a/gcc/testsuite/gcc.dg/torture/20190924-1.c b/gcc/testsuite/gcc.dg/torture/20190924-1.c
new file mode 100644 (file)
index 0000000..13b46ac
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/20190924-1.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+
+struct acct_gather_energy {
+   int base_consumed_energy;
+   int consumed_energy;
+   int previous_consumed_energy;
+};
+static struct acct_gather_energy xcc_energy;
+struct acct_gather_energy *new;
+int _get_joules_task(int first)
+{
+  if (!first && new->previous_consumed_energy)
+    first = 1;
+  new->base_consumed_energy = new->consumed_energy;
+  __builtin_memcpy(&xcc_energy, new, sizeof(struct acct_gather_energy));
+  return xcc_energy.base_consumed_energy;
+}

diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index c29e2de..44b8c67 100644 (file)
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -2935,8 +2935,9 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *data_,
          else
            return (void *)-1;
        }
-      if (TREE_CODE (rhs) != SSA_NAME
-         && TREE_CODE (rhs) != ADDR_EXPR)
+      if (TREE_CODE (rhs) == SSA_NAME)
+       rhs = SSA_VAL (rhs);
+      else if (TREE_CODE (rhs) != ADDR_EXPR)
        return (void *)-1;
 
       /* The bases of the destination and the references have to agree.  */