changeset 14169:1ddbe67f6f77

Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 13 Mar 2014 13:27:20 +0100
parents b8e62af091ee (current diff) 2a4d3ceb7ed3 (diff)
children cdc20b409a9c
files
diffstat 1 files changed, 14 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java	Thu Mar 13 11:53:12 2014 +0100
+++ b/graal/com.oracle.graal.printer/src/com/oracle/graal/printer/CFGPrinter.java	Thu Mar 13 13:27:20 2014 +0100
@@ -250,20 +250,24 @@
             }
         }
 
-        Node cur = block.getBeginNode();
-        while (true) {
-            printNode(cur, false);
+        // Currently no node printing for lir
+        if (lir == null) {
+            Node cur = block.getBeginNode();
+            while (true) {
+                printNode(cur, false);
 
-            if (cur == block.getEndNode()) {
-                for (Map.Entry<Node, Block> entry : latestScheduling.entries()) {
-                    if (entry.getValue() == block && !inFixedSchedule(entry.getKey()) && !printedNodes.isMarked(entry.getKey())) {
-                        printNode(entry.getKey(), true);
+                if (cur == block.getEndNode()) {
+                    for (Map.Entry<Node, Block> entry : latestScheduling.entries()) {
+                        if (entry.getValue() == block && !inFixedSchedule(entry.getKey()) && !printedNodes.isMarked(entry.getKey())) {
+                            printNode(entry.getKey(), true);
+                        }
                     }
+                    break;
                 }
-                break;
+                assert cur.successors().count() == 1;
+                cur = cur.successors().first();
             }
-            assert cur.successors().count() == 1;
-            cur = cur.successors().first();
+
         }
 
         out.enableIndentation();