Mercurial > hg > graal-compiler
changeset 10424:e6cf435419b2
Fix after lowering phase refactoring.
| author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
|---|---|
| date | Wed, 19 Jun 2013 23:50:43 +0200 |
| parents | a6697eaddebd |
| children | b61e946bf0ef |
| files | graal/com.oracle.graal.graph/src/com/oracle/graal/graph/NodeClass.java graal/com.oracle.graal.phases.common/src/com/oracle/graal/phases/common/LoweringPhase.java |
| diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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; }
--- 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());