commit 47aded70f06f7dcea62279d9dca36f2ae70e6167
author Ian Zerny <zerny@google.com> Tue Jun 27 10:38:38 2017 +0200
committer Ian Zerny <zerny@google.com> Tue Jun 27 10:38:38 2017 +0200
tree 99fa8b9966fb91b093c8a05e4ca0afab92113c38
parent ad72cb9d6a7905debc115f4dcedf56fa0195cbff

Don't associate local info with argument moves.

Change-Id: I210bb2433e419971c02e668e8f60e6d833c5883e

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 9276f45..30d833b 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
@@ -21,7 +21,6 @@
 import com.android.tools.r8.ir.code.Phi;
 import com.android.tools.r8.ir.code.Sub;
 import com.android.tools.r8.ir.code.Value;
-import com.android.tools.r8.ir.code.Value.DebugInfo;
 import com.android.tools.r8.ir.code.Xor;
 import com.android.tools.r8.logging.Log;
 import com.android.tools.r8.utils.CfgPrinter;
@@ -1809,8 +1808,8 @@
     code.blocks.forEach(BasicBlock::clearUserInfo);
   }
 
-  private Value createValue(MoveType type, DebugInfo debugInfo) {
-    Value value = code.createValue(type, debugInfo);
+  private Value createValue(MoveType type) {
+    Value value = code.createValue(type, null);
     value.setNeedsRegister(true);
     return value;
   }
@@ -1830,7 +1829,7 @@
       Value previous = null;
       for (int i = 0; i < arguments.size(); i++) {
         Value argument = arguments.get(i);
-        Value newArgument = createValue(argument.outType(), argument.getDebugInfo());
+        Value newArgument = createValue(argument.outType());
         Move move = new Move(newArgument, argument);
         move.setBlock(invoke.getBlock());
         replaceArgument(invoke, i, newArgument);
@@ -1857,7 +1856,7 @@
   }
 
   private Value createSentinelRegisterValue() {
-    return createValue(MoveType.OBJECT, null);
+    return createValue(MoveType.OBJECT);
   }
 
   private LiveIntervals createSentinelLiveInterval(Value sentinelValue) {