# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1371678643 -7200
# Node ID e6cf435419b20fc83e4acd97c7337458cb1623c0
# Parent  a6697eaddebd9616f257aef6143f5a913d788630
Fix after lowering phase refactoring.

diff -r a6697eaddebd -r e6cf435419b2 graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java
--- a/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java	Wed Jun 19 21:54:38 2013 +0200
+++ b/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java	Wed Jun 19 23:50:43 2013 +0200
@@ -669,12 +669,8 @@
         while (index < directSuccessorCount) {
             Node successor = getNode(node, successorOffsets[index]);
             if (successor == old) {
-                assert other == null || fieldTypes.get(successorOffsets[index]).isAssignableFrom(other.getClass()); // :
-                                                                                                                    // successorTypes[index]
-                                                                                                                    // +
-                                                                                                                    // " is not compatible with "
-                                                                                                                    // +
-                                                                                                                    // other.getClass();
+                assert other == null || fieldTypes.get(successorOffsets[index]).isAssignableFrom(other.getClass()) : fieldTypes.get(successorOffsets[index]) + " is not compatible with " +
+                                other.getClass();
                 putNode(node, successorOffsets[index], other);
                 return true;
             }
diff -r a6697eaddebd -r e6cf435419b2 graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java
--- a/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java	Wed Jun 19 21:54:38 2013 +0200
+++ b/graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java	Wed Jun 19 23:50:43 2013 +0200
@@ -228,7 +228,9 @@
 
                 if (loweringTool.lastFixedNode() == null) {
                     AbstractBeginNode beginNode = b.getBeginNode();
-                    if (node instanceof Lowerable) {
+                    if (node == beginNode) {
+                        loweringTool.setLastFixedNode(beginNode);
+                    } else if (node instanceof Lowerable) {
                         // Handles cases where there is a lowerable nodes scheduled before the begin
                         // node.
                         BeginNode newBegin = node.graph().add(new BeginNode());