Revert change to MethodReference#toString
Change-Id: Id7ba2008800f2542d39b461ebf103dbd3aef8ac2
diff --git a/src/main/java/com/android/tools/r8/position/MethodPosition.java b/src/main/java/com/android/tools/r8/position/MethodPosition.java
index efb4226..3dad358 100644
--- a/src/main/java/com/android/tools/r8/position/MethodPosition.java
+++ b/src/main/java/com/android/tools/r8/position/MethodPosition.java
@@ -9,6 +9,7 @@
import com.android.tools.r8.keepanno.annotations.KeepForApi;
import com.android.tools.r8.references.MethodReference;
import com.android.tools.r8.references.TypeReference;
+import com.android.tools.r8.utils.MethodReferenceUtils;
import java.util.List;
import java.util.stream.Collectors;
@@ -86,7 +87,7 @@
@Override
public String toString() {
- return method.toString();
+ return MethodReferenceUtils.toSmaliString(method);
}
@Override
diff --git a/src/main/java/com/android/tools/r8/references/MethodReference.java b/src/main/java/com/android/tools/r8/references/MethodReference.java
index c9d5102..788f1d9 100644
--- a/src/main/java/com/android/tools/r8/references/MethodReference.java
+++ b/src/main/java/com/android/tools/r8/references/MethodReference.java
@@ -4,7 +4,6 @@
package com.android.tools.r8.references;
import com.android.tools.r8.keepanno.annotations.KeepForApi;
-import com.android.tools.r8.utils.MethodReferenceUtils;
import com.android.tools.r8.utils.StringUtils;
import com.android.tools.r8.utils.StringUtils.BraceType;
import java.util.List;
@@ -82,7 +81,7 @@
@Override
public String toString() {
- return MethodReferenceUtils.toSmaliString(this);
+ return getHolderClass() + getMethodName() + getMethodDescriptor();
}
public String toSourceString() {
diff --git a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java
index ccf9f8f..d4c079c 100644
--- a/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/DesugarMissingTypeStaticInvokeTest.java
@@ -19,7 +19,7 @@
import com.android.tools.r8.errors.InterfaceDesugarMissingTypeDiagnostic;
import com.android.tools.r8.references.Reference;
import com.android.tools.r8.utils.AndroidApiLevel;
-import com.android.tools.r8.utils.DescriptorUtils;
+import com.android.tools.r8.utils.MethodReferenceUtils;
import com.android.tools.r8.utils.StringUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -81,8 +81,8 @@
assertThat(
desugarWarning.getPosition().getDescription(),
containsString(
- DescriptorUtils.javaTypeToDescriptor(TestClass.class.getTypeName())
- + "main([Ljava/lang/String;)V"));
+ MethodReferenceUtils.toSmaliString(
+ MethodReferenceUtils.mainMethod(TestClass.class))));
}
}
}
