Revert:

	2015-07-23  Alexandre Oliva <aoliva@redhat.com>

From-SVN: r226202

5 files changed, 14 insertions, 43 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 56e1d81..a05f16c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2015-07-25  David Edelsohn  <dje.gcc@gmail.com>
+
+	Revert:
+	2015-07-23  Alexandre Oliva <aoliva@redhat.com>
+
+	PR rtl-optimization/64164
+	* gcc.dg/guality/pr54200.c: Add -fno-tree-coalesce-vars.
+	* gcc.dg/ssp-1.c: Make counter a register.
+	* gcc.dg/ssp-2.c: Likewise.
+	* gcc.dg/torture/parm-coalesce.c: New.
+
 2015-07-24  Tom de Vries  <tom@codesourcery.com>
 
 	* gcc.dg/graphite/block-1.c: Xfail scan.
diff --git a/gcc/testsuite/gcc.dg/guality/pr54200.c b/gcc/testsuite/gcc.dg/guality/pr54200.c
index e1e7293..9b17187 100644
--- a/gcc/testsuite/gcc.dg/guality/pr54200.c
+++ b/gcc/testsuite/gcc.dg/guality/pr54200.c
@@ -1,6 +1,6 @@
 /* PR tree-optimization/54200 */
 /* { dg-do run } */
-/* { dg-options "-g -fno-var-tracking-assignments -fno-tree-coalesce-vars" } */
+/* { dg-options "-g -fno-var-tracking-assignments" } */
 
 int o __attribute__((used));
 
diff --git a/gcc/testsuite/gcc.dg/ssp-1.c b/gcc/testsuite/gcc.dg/ssp-1.c
index db69332..5467f4d 100644
--- a/gcc/testsuite/gcc.dg/ssp-1.c
+++ b/gcc/testsuite/gcc.dg/ssp-1.c
@@ -12,7 +12,7 @@ __stack_chk_fail (void)
 
 int main ()
 {
-  register int i;
+  int i;
   char foo[255];
 
   // smash stack
diff --git a/gcc/testsuite/gcc.dg/ssp-2.c b/gcc/testsuite/gcc.dg/ssp-2.c
index 752fe53..9a7ac32 100644
--- a/gcc/testsuite/gcc.dg/ssp-2.c
+++ b/gcc/testsuite/gcc.dg/ssp-2.c
@@ -14,7 +14,7 @@ __stack_chk_fail (void)
 void
 overflow()
 {
-  register int i = 0;
+  int i = 0;
   char foo[30];
 
   /* Overflow buffer.  */
diff --git a/gcc/testsuite/gcc.dg/torture/parm-coalesce.c b/gcc/testsuite/gcc.dg/torture/parm-coalesce.c
deleted file mode 100644
index dbd81c1..0000000
--- a/gcc/testsuite/gcc.dg/torture/parm-coalesce.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* { dg-do run } */
-
-#include <stdlib.h>
-
-/* Make sure we don't coalesce both incoming parms, one whose incoming
-   value is unused, to the same location, so as to overwrite one of
-   them with the incoming value of the other.  */
-
-int __attribute__((noinline, noclone))
-foo (int i, int j)
-{
-  j = i; /* The incoming value for J is unused.  */
-  i = 2;
-  if (j)
-    j++;
-  j += i + 1;
-  return j;
-}
-
-/* Same as foo, but with swapped parameters.  */
-int __attribute__((noinline, noclone))
-bar (int j, int i)
-{
-  j = i; /* The incoming value for J is unused.  */
-  i = 2;
-  if (j)
-    j++;
-  j += i + 1;
-  return j;
-}
-
-int
-main (void)
-{
-  if (foo (0, 1) != 3)
-    abort ();
-  if (bar (1, 0) != 3)
-    abort ();
-  return 0;
-}