From: Richard Guenther <rguenther@suse.de>
Date: Mon, 6 Dec 2010 12:53:38 +0000 (+0000)
Subject: re PR tree-optimization/46806 (-O3 implies 0 <= 8 <= 7)
X-Git-Tag: releases/gcc-4.6.0~2119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbb9d2fd5c8f15120726b3da90f539dc25f509f5;p=thirdparty%2Fgcc.git

re PR tree-optimization/46806 (-O3 implies 0 <= 8 <= 7)

2010-12-06  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/46806
	* tree-ssa-copyrename.c (copy_rename_partition_coalesce): Do not
	coalesce different types.

	* g++.dg/torture/20100825.C: New testcase.

From-SVN: r167490
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ccb7019fa41b..f01b9fe11aea 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-06  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/46806
+	* tree-ssa-copyrename.c (copy_rename_partition_coalesce): Do not
+	coalesce different types.
+
 2010-12-06  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/46785
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 600655d1d2cc..5c3b6971e341 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-06  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/46806
+	* g++.dg/torture/20100825.C: New testcase.
+
 2010-12-06  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/46785
diff --git a/gcc/testsuite/g++.dg/torture/20100825.C b/gcc/testsuite/g++.dg/torture/20100825.C
new file mode 100644
index 000000000000..460c1b608753
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/20100825.C
@@ -0,0 +1,15 @@
+// { dg-do run }
+
+typedef enum { zero = 0, one = 1, two = 2, ENUM_MAX = 3 } my_enum;
+my_enum e;
+extern "C" void abort (void);
+int __attribute__((noinline)) foo() { return 10; }
+int main()
+{
+  int r;
+  r = foo();
+  if ((r < 0) || (r >= ENUM_MAX))
+    return 0;
+  e = (my_enum)r;
+  abort ();
+}
diff --git a/gcc/tree-ssa-copyrename.c b/gcc/tree-ssa-copyrename.c
index 41d43a6179cd..abee6b9407fb 100644
--- a/gcc/tree-ssa-copyrename.c
+++ b/gcc/tree-ssa-copyrename.c
@@ -226,11 +226,11 @@ copy_rename_partition_coalesce (var_map map, tree var1, tree var2, FILE *debug)
       ign2 = false;
     }
 
-  /* Don't coalesce if the two variables aren't type compatible.  */
-  if (!types_compatible_p (TREE_TYPE (root1), TREE_TYPE (root2)))
+  /* Don't coalesce if the two variables are not of the same type.  */
+  if (TREE_TYPE (root1) != TREE_TYPE (root2))
     {
       if (debug)
-	fprintf (debug, " : Incompatible types.  No coalesce.\n");
+	fprintf (debug, " : Different types.  No coalesce.\n");
       return false;
     }