Mercurial > hg > graal-compiler

changeset 23180:ae1e007bbd2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing null check in LoopFragment code.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 14 Dec 2015 18:41:57 +0100
parents 4523d9fbfebe
children e7bb0c48b7a7
files graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragment.java
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragment.java	Mon Dec 14 16:52:26 2015 +0100
+++ b/graal/com.oracle.graal.loop/src/com/oracle/graal/loop/LoopFragment.java	Mon Dec 14 18:41:57 2015 +0100
@@ -353,7 +353,7 @@
                  * VirtualState nodes contained in the old exit's state may be shared by other
                  * dominated VirtualStates. Those dominated virtual states need to see the
                  * proxy->phi update that are applied below.
-                 *
+                 * 
                  * We now update the original fragment's nodes accordingly:
                  */
                 originalExitState.applyToVirtual(node -> original.nodes.clearAndGrow(node));
@@ -398,7 +398,7 @@
                     }
                     if (usage instanceof VirtualState) {
                         VirtualState stateUsage = (VirtualState) usage;
-                        if (finalExitState.isPartOfThisState(stateUsage)) {
+                        if (finalExitState != null && finalExitState.isPartOfThisState(stateUsage)) {
                             return false;
                         }
                     }