Mercurial > hg > graal-compiler

changeset 23128:80cf19158674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christian Wimmer <christian.wimmer@oracle.com>
date Tue, 01 Dec 2015 08:45:20 -0800
parents 65c5ac65b07f (diff) 1705cb8e3dfe (current diff)
children 88fb9daa58fb
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimplifyingGraphDecoder.java	Thu Nov 26 22:27:50 2015 -0800
+++ b/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/SimplifyingGraphDecoder.java	Tue Dec 01 08:45:20 2015 -0800
@@ -175,7 +175,9 @@
                 Node canonical;
                 if (condition.getValue() == guard.isNegated()) {
                     DeoptimizeNode deopt = new DeoptimizeNode(guard.getAction(), guard.getReason(), guard.getSpeculation());
-                    deopt.setStateBefore(guard.stateBefore());
+                    if (guard.stateBefore() != null) {
+                        deopt.setStateBefore(guard.stateBefore());
+                    }
                     canonical = deopt;
                 } else {
                     /*