commit 58602038312c83853e82d6da8bc3c7612e1382f4
author Ian Zerny <zerny@google.com> Wed Oct 11 11:21:43 2017 +0200
committer Ian Zerny <zerny@google.com> Wed Oct 11 11:21:43 2017 +0200
tree 8e2b4ffefef43904619ef771b2bbdadd03102114
parent 5a03469d65964278bc88f14d3b0bd4932f13bc40

Fix merge failure.

Renamed identicalNonValueParts to identicalNonValueNonPositionParts
in newly added IR instructions.

R=ager

Change-Id: Ie1ca80111146c5fc50dffc79a53d55269f7cc088

src/main/java/com/android/tools/r8/ir/code/ConstMethodHandle.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/ConstMethodHandle.java b/src/main/java/com/android/tools/r8/ir/code/ConstMethodHandle.java
index 108eb32..1cd1b20 100644
--- a/src/main/java/com/android/tools/r8/ir/code/ConstMethodHandle.java
+++ b/src/main/java/com/android/tools/r8/ir/code/ConstMethodHandle.java
@@ -5,7 +5,6 @@
 
 import com.android.tools.r8.dex.Constants;
 import com.android.tools.r8.graph.DexMethodHandle;
-import com.android.tools.r8.graph.DexString;
 import com.android.tools.r8.ir.conversion.DexBuilder;
 
 public class ConstMethodHandle extends ConstInstruction {
@@ -33,7 +32,7 @@
   }
 
   @Override
-  public boolean identicalNonValueParts(Instruction other) {
+  public boolean identicalNonValueNonPositionParts(Instruction other) {
     return other.asConstMethodHandle().methodHandle == methodHandle;
   }
 

src/main/java/com/android/tools/r8/ir/code/ConstMethodType.java

diff --git a/src/main/java/com/android/tools/r8/ir/code/ConstMethodType.java b/src/main/java/com/android/tools/r8/ir/code/ConstMethodType.java
index 3e32bb6..cbcf143 100644
--- a/src/main/java/com/android/tools/r8/ir/code/ConstMethodType.java
+++ b/src/main/java/com/android/tools/r8/ir/code/ConstMethodType.java
@@ -5,7 +5,6 @@
 
 import com.android.tools.r8.dex.Constants;
 import com.android.tools.r8.graph.DexProto;
-import com.android.tools.r8.graph.DexString;
 import com.android.tools.r8.ir.conversion.DexBuilder;
 
 public class ConstMethodType extends ConstInstruction {
@@ -33,7 +32,7 @@
   }
 
   @Override
-  public boolean identicalNonValueParts(Instruction other) {
+  public boolean identicalNonValueNonPositionParts(Instruction other) {
     return other.asConstMethodType().methodType == methodType;
   }