# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1433517128 -7200
# Node ID f60f7994c5a54ee8e247fe6aeb48073f5d8b75e3
# Parent  30b4de402a5881b177d8d0abb4c1140d67a6e4b8# Parent  2e850dbf82ae1b0bbd3719e2656135a5683bf9d4
Merge.

diff -r 2e850dbf82ae -r f60f7994c5a5 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java	Fri Jun 05 14:12:49 2015 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/GuardLoweringPhase.java	Fri Jun 05 17:12:08 2015 +0200
@@ -119,12 +119,11 @@
             if (guard != null && isImplicitNullCheck(access.accessLocation())) {
                 if (object instanceof PiNode) {
                     PiNode piNode = (PiNode) object;
-                    if (access.object() == object) {
-                        access.asNode().replaceFirstInput(object, piNode.getOriginalNode());
-                    }
-                    if (!(piNode.getGuard() instanceof GuardNode)) {
-                        return;
-                    }
+                    assert piNode.getGuard() instanceof GuardNode;
+                    assert access.object() == object;
+                    access.asNode().replaceFirstInput(object, piNode.getOriginalNode());
+                } else {
+                    assert guard instanceof GuardNode;
                 }
                 metricImplicitNullCheck.increment();
                 access.setGuard(null);
@@ -154,7 +153,7 @@
                 if (condition.hasNoUsages()) {
                     GraphUtil.killWithUnusedFloatingInputs(condition);
                 }
-                nullGuarded.remove(fixedAccess.object());
+                nullGuarded.remove(object);
             }
         }