Mercurial > hg > graal-compiler

changeset 22830:fa48dd0537cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TraceRA: TraceLinearScanWalker: refactor insertIdAtBasicBlockBoundary.
author Josef Eisl <josef.eisl@jku.at>
date Thu, 08 Oct 2015 15:18:56 +0200
parents a60600b1221f
children 442985bada8c
files graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java	Thu Oct 08 15:14:48 2015 +0200
+++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/alloc/trace/TraceLinearScanWalker.java	Thu Oct 08 15:18:56 2015 +0200
@@ -249,16 +249,13 @@
         AbstractBlockBase<?> toBlock = allocator.blockForId(opId);
         AbstractBlockBase<?> fromBlock = allocator.blockForId(opId - 2);
 
-        final int operandId;
         if (fromBlock.getSuccessorCount() == 1) {
             // insert move in predecessor
-            operandId = opId - 2;
-        } else {
-            assert toBlock.getPredecessorCount() == 1 : String.format("Critical Edge? %s->%s", fromBlock, toBlock);
-            // insert move in predecessor
-            operandId = opId + 2;
+            return opId - 2;
         }
-        return operandId;
+        assert toBlock.getPredecessorCount() == 1 : String.format("Critical Edge? %s->%s", fromBlock, toBlock);
+        // insert move in successor
+        return opId + 2;
     }
 
     private void insertMove(int operandId, TraceInterval srcIt, TraceInterval dstIt) {