Mercurial > hg > graal-compiler

changeset 21757:f60f7994c5a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Fri, 05 Jun 2015 17:12:08 +0200
parents 30b4de402a58 (diff) 2e850dbf82ae (current diff)
children 532f9b06f54e
files graal/com.oracle.graal.printer/src/com/oracle/graal/printer/HexCodeFile.java graal/com.oracle.jvmci.code/src/com/oracle/jvmci/code/DisassemblerProvider.java
diffstat 1 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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);
             }
         }