# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1376095463 -7200
# Node ID 6d28ce8cdeb7ff7597e184db37ee8f8527bd9d10
# Parent  e75e8ffdf87cca0818e40b6bda2a54370c5473f6
Fix canonicalization of conditional nodes, add a test for this bug

diff -r e75e8ffdf87c -r 6d28ce8cdeb7 graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Logic0.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.jtt/src/com/oracle/graal/jtt/optimize/Logic0.java	Sat Aug 10 02:44:23 2013 +0200
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2011, 2012, 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 Logic0 extends JTTTest {
+
+    public static int test(int a, int b) {
+        if (((a != 0 ? 1 : 0) & (a != b ? 1 : 0)) != 0) {
+            return 42;
+        }
+        return 11;
+    }
+
+    @Test
+    public void run0() throws Throwable {
+        runTest("test", 0, 0);
+    }
+
+    @Test
+    public void run1() throws Throwable {
+        runTest("test", 0, 33);
+    }
+
+    @Test
+    public void run2() throws Throwable {
+        runTest("test", 33, 66);
+    }
+
+    @Test
+    public void run3() throws Throwable {
+        runTest("test", 33, 67);
+    }
+
+    @Test
+    public void run4() throws Throwable {
+        runTest("test", 33, 33);
+    }
+
+    @Test
+    public void run5() throws Throwable {
+        runTest("test", 0, 32);
+    }
+
+    @Test
+    public void run6() throws Throwable {
+        runTest("test", 32, 66);
+    }
+
+    @Test
+    public void run7() throws Throwable {
+        runTest("test", 32, 67);
+    }
+
+    @Test
+    public void run8() throws Throwable {
+        runTest("test", 32, 32);
+    }
+}
diff -r e75e8ffdf87c -r 6d28ce8cdeb7 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java	Fri Aug 09 10:49:18 2013 -0700
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/calc/ConditionalNode.java	Sat Aug 10 02:44:23 2013 +0200
@@ -28,6 +28,7 @@
 import com.oracle.graal.nodes.*;
 import com.oracle.graal.nodes.java.*;
 import com.oracle.graal.nodes.spi.*;
+import com.oracle.graal.nodes.type.*;
 
 /**
  * The {@code ConditionalNode} class represents a comparison that yields one of two values. Note
@@ -65,9 +66,12 @@
         // this optimizes the case where a value that can only be 0 or 1 is materialized to 0 or 1
         if (x().isConstant() && y().isConstant() && condition instanceof IntegerEqualsNode) {
             IntegerEqualsNode equals = (IntegerEqualsNode) condition;
-            if (equals.y().isConstant() && equals.y().asConstant().equals(Constant.INT_0)) {
-                if (x().asConstant().equals(Constant.INT_0) && y().asConstant().equals(Constant.INT_1)) {
-                    return equals.x();
+            if (equals.y().isConstant() && equals.y().asConstant().equals(Constant.INT_0) && equals.x().stamp() instanceof IntegerStamp) {
+                IntegerStamp equalsXStamp = (IntegerStamp) equals.x().stamp();
+                if (equalsXStamp.mask() == 1) {
+                    if (x().asConstant().equals(Constant.INT_0) && y().asConstant().equals(Constant.INT_1)) {
+                        return equals.x();
+                    }
                 }
             }
         }