Mercurial > hg > graal-compiler

changeset 22461:5d949bb82c85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix: need to check for new nodes to prevent assertion errors
author Christian Wimmer <christian.wimmer@oracle.com>
date Fri, 14 Aug 2015 17:27:13 -0700
parents dc83e538dc8b
children f64298cbfd16
files graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java	Fri Aug 14 17:26:37 2015 -0700
+++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/IdealGraphPrinter.java	Fri Aug 14 17:27:13 2015 -0700
@@ -140,7 +140,8 @@
                 printProperty("name", name);
             }
             printProperty("class", node.getClass().getSimpleName());
-            Block block = nodeToBlock == null ? null : nodeToBlock.get(node);
+
+            Block block = nodeToBlock == null || nodeToBlock.isNew(node) ? null : nodeToBlock.get(node);
             if (block != null) {
                 printProperty("block", Integer.toString(block.getId()));
                 // if (!(node instanceof PhiNode || node instanceof FrameState || node instanceof
@@ -254,7 +255,7 @@
 
         if (nodeToBlock != null) {
             for (Node n : graph.getNodes()) {
-                Block blk = nodeToBlock.get(n);
+                Block blk = nodeToBlock.isNew(n) ? null : nodeToBlock.get(n);
                 if (blk == block) {
                     nodes.add(n);
                 }