# HG changeset patch # User Lukas Stadler # Date 1390395827 -3600 # Node ID 1541666f4cd71a394a7bc3f464c15b4e72338600 # Parent 10e6f192631fae0e52566bd696677056b34c79ae fix GuardNode canonicalization diff -r 10e6f192631f -r 1541666f4cd7 graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java --- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Jan 22 13:39:45 2014 +0100 +++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/GuardNode.java Wed Jan 22 14:03:47 2014 +0100 @@ -112,7 +112,7 @@ } else if (negated && condition() instanceof ShortCircuitOrNode) { ShortCircuitOrNode or = (ShortCircuitOrNode) condition(); GuardNode firstGuard = graph().unique(new GuardNode(or.getX(), getGuard(), reason, action, !or.isXNegated(), speculation)); - GuardNode secondGuard = graph().unique(new GuardNode(or.getY(), firstGuard, reason, action, or.isYNegated(), speculation)); + GuardNode secondGuard = graph().unique(new GuardNode(or.getY(), firstGuard, reason, action, !or.isYNegated(), speculation)); return secondGuard; } return this;