# HG changeset patch # User Josef Eisl # Date 1429523781 -7200 # Node ID f74b9f898cf299a36f5c6d72d34b949b16631246 # Parent cdb65346129d220ed2410145215d9e7ad9434165 NodeLIRBuilder: move creation of jump from moveToPhi() to visitEndNode(). diff -r cdb65346129d -r f74b9f898cf2 graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java --- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Tue Apr 21 17:52:26 2015 +0200 +++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/gen/NodeLIRBuilder.java Mon Apr 20 11:56:21 2015 +0200 @@ -346,7 +346,9 @@ @Override public void visitEndNode(AbstractEndNode end) { - moveToPhi(end.merge(), end); + AbstractMergeNode merge = end.merge(); + moveToPhi(merge, end); + append(newJumpOp(getLIRBlock(merge))); } /** @@ -368,8 +370,6 @@ } } resolver.dispose(); - - append(newJumpOp(getLIRBlock(merge))); } protected JumpOp newJumpOp(LabelRef ref) {