# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1385743203 -3600
# Node ID bb992a44734e4e6d6d113a9773e692ae23d86c03
# Parent  717de4f0b38f40fa1a2d2799f38ad1d8fb2199d2
Fix Compare Canonicalization with 2 converts from different kinds as input
Add test case

diff -r 717de4f0b38f -r bb992a44734e graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConvertCompare.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/ConvertCompare.java	Fri Nov 29 17:40:03 2013 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2013, 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.jtt.optimize;
+
+import com.oracle.graal.jtt.*;
+import org.junit.*;
+
+public class ConvertCompare extends JTTTest {
+    public static boolean test(int a, float d) {
+        return a == (double) d;
+    }
+
+    @Test
+    public void run0() throws Throwable {
+        runTest("test", 0, 2.87f);
+    }
+}
diff -r 717de4f0b38f -r bb992a44734e graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java	Fri Nov 29 12:20:12 2013 +0100
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/CompareNode.java	Fri Nov 29 17:40:03 2013 +0100
@@ -136,7 +136,7 @@
         if (x() instanceof ConvertNode && y() instanceof ConvertNode) {
             ConvertNode convertX = (ConvertNode) x();
             ConvertNode convertY = (ConvertNode) y();
-            if (convertX.isLossless() && convertY.isLossless()) {
+            if (convertX.isLossless() && convertY.isLossless() && convertX.getFromKind() == convertY.getFromKind()) {
                 setX(convertX.value());
                 setY(convertY.value());
             }