commit 4851e8b0aab49ad106ede4d68d6d404c01e25b19
author Mads Ager <ager@google.com> Thu Jun 01 08:05:10 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 01 08:05:10 2017 +0000
tree 4006a95f7bb28d489864d055d3512116afddd7bc
parent d055b58cd8b323dda7b58a81157427f859486dde
parent 19a81f1e715d97c57c0adf94568101dbdf65dfa1

Merge "Fix main dex list expectation after changing register allocator."

src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java

diff --git a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
index 7bb6a4a..3ccf2b3 100644
--- a/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
+++ b/src/main/java/com/android/tools/r8/ir/regalloc/LinearScanRegisterAllocator.java
@@ -1742,7 +1742,20 @@
     // If the invoke instruction require more than 5 registers we link the inputs because they
     // need to be in consecutive registers.
     if (invoke.requiredArgumentRegisters() > 5) {
-      replaceFullArgumentList(invoke, insertAt);
+      List<Value> arguments = invoke.arguments();
+      Value previous = null;
+      for (int i = 0; i < arguments.size(); i++) {
+        Value argument = arguments.get(i);
+        Value newArgument = createValue(argument.outType(), argument.getDebugInfo());
+        Move move = new Move(newArgument, argument);
+        move.setBlock(invoke.getBlock());
+        replaceArgument(invoke, i, newArgument);
+        insertAt.add(move);
+        if (previous != null) {
+          previous.linkTo(newArgument);
+        }
+        previous = newArgument;
+      }
     }
   }
 
@@ -1809,33 +1822,6 @@
     }
   }
 
-  private void replaceFullArgumentList(Invoke invoke, InstructionListIterator insertAt) {
-    List<Value> arguments = invoke.arguments();
-    Value previous = null;
-    for (int i = 0; i < arguments.size(); i++) {
-      generateArgumentMove(invoke, i, insertAt);
-      if (previous != null) {
-        previous.linkTo(arguments.get(i));
-      }
-      previous = arguments.get(i);
-    }
-  }
-
-  private Move generateArgumentMove(Invoke invoke, int i) {
-    List<Value> arguments = invoke.arguments();
-    Value argument = arguments.get(i);
-    Value newArgument = createValue(argument.outType(), argument.getDebugInfo());
-    Move move = new Move(newArgument, argument);
-    move.setBlock(invoke.getBlock());
-    replaceArgument(invoke, i, newArgument);
-    return move;
-  }
-
-  private void generateArgumentMove(Invoke invoke, int i, InstructionListIterator insertAt) {
-    Move move = generateArgumentMove(invoke, i);
-    insertAt.add(move);
-  }
-
   private void computeNeedsRegister() {
     for (BasicBlock block : code.topologicallySortedBlocks()) {
       for (Instruction instruction : block.getInstructions()) {