commit 717ab82cc71d47e829961b7722ef7825d9051b46
author Christoffer Quist Adamsen <christofferqa@google.com> Thu May 28 12:43:10 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Thu May 28 11:06:00 2020 +0000
tree 40fb2e998ea8e387f5da2dcea76d868ab4dd0c86
parent af42f19376951323c50a05289b0286cd16dbf6c6

Deprecate definitionFor() overloads not taking DexType

Bug: 157616970
Change-Id: I32ebd5bc5988bbdc1cea39b7abcfb7dff3bbdba6

src/main/java/com/android/tools/r8/graph/AppInfo.java

diff --git a/src/main/java/com/android/tools/r8/graph/AppInfo.java b/src/main/java/com/android/tools/r8/graph/AppInfo.java
index 0b5d100..7931476 100644
--- a/src/main/java/com/android/tools/r8/graph/AppInfo.java
+++ b/src/main/java/com/android/tools/r8/graph/AppInfo.java
@@ -130,6 +130,7 @@
     return app.classesWithDeterministicOrder();
   }
 
+  @Deprecated
   @Override
   public DexDefinition definitionFor(DexReference reference) {
     assert checkIfObsolete();
@@ -181,6 +182,7 @@
     return definition == null ? Origin.unknown() : definition.origin;
   }
 
+  @Deprecated
   @Override
   public DexEncodedMethod definitionFor(DexMethod method) {
     assert checkIfObsolete();
@@ -195,6 +197,7 @@
     return clazz.getMethodCollection().getMethod(method);
   }
 
+  @Deprecated
   @Override
   public DexEncodedField definitionFor(DexField field) {
     assert checkIfObsolete();

src/main/java/com/android/tools/r8/graph/AppView.java

diff --git a/src/main/java/com/android/tools/r8/graph/AppView.java b/src/main/java/com/android/tools/r8/graph/AppView.java
index 8077269..99a1803 100644
--- a/src/main/java/com/android/tools/r8/graph/AppView.java
+++ b/src/main/java/com/android/tools/r8/graph/AppView.java
@@ -226,16 +226,19 @@
     return this.sourceDebugExtensions.get(clazz);
   }
 
+  @Deprecated
   @Override
   public final DexDefinition definitionFor(DexReference reference) {
     return appInfo().definitionFor(reference);
   }
 
+  @Deprecated
   @Override
   public final DexEncodedField definitionFor(DexField field) {
     return appInfo().definitionFor(field);
   }
 
+  @Deprecated
   @Override
   public final DexEncodedMethod definitionFor(DexMethod method) {
     return appInfo().definitionFor(method);

src/main/java/com/android/tools/r8/graph/DexDefinitionSupplier.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexDefinitionSupplier.java b/src/main/java/com/android/tools/r8/graph/DexDefinitionSupplier.java
index 3d4e92b..a7a1b1e 100644
--- a/src/main/java/com/android/tools/r8/graph/DexDefinitionSupplier.java
+++ b/src/main/java/com/android/tools/r8/graph/DexDefinitionSupplier.java
@@ -6,12 +6,16 @@
 
 public interface DexDefinitionSupplier {
 
+  @Deprecated
   DexDefinition definitionFor(DexReference reference);
 
+  @Deprecated
   DexEncodedField definitionFor(DexField field);
 
+  @Deprecated
   DexEncodedMethod definitionFor(DexMethod method);
 
+  @Deprecated
   @SuppressWarnings("unchecked")
   default <D extends DexEncodedMember<D, R>, R extends DexMember<D, R>>
       DexEncodedMember<D, R> definitionFor(DexMember<D, R> member) {

src/main/java/com/android/tools/r8/graph/DirectMappedDexApplication.java

diff --git a/src/main/java/com/android/tools/r8/graph/DirectMappedDexApplication.java b/src/main/java/com/android/tools/r8/graph/DirectMappedDexApplication.java
index 5f0a349..60a1c49 100644
--- a/src/main/java/com/android/tools/r8/graph/DirectMappedDexApplication.java
+++ b/src/main/java/com/android/tools/r8/graph/DirectMappedDexApplication.java
@@ -73,6 +73,7 @@
     return classpathClasses;
   }
 
+  @Deprecated
   @Override
   public DexDefinition definitionFor(DexReference reference) {
     if (reference.isDexType()) {
@@ -85,12 +86,14 @@
     return definitionFor(reference.asDexField());
   }
 
+  @Deprecated
   @Override
   public DexEncodedField definitionFor(DexField field) {
     DexClass clazz = definitionFor(field.holder);
     return clazz != null ? clazz.lookupField(field) : null;
   }
 
+  @Deprecated
   @Override
   public DexEncodedMethod definitionFor(DexMethod method) {
     DexClass clazz = definitionFor(method.holder);

src/main/java/com/android/tools/r8/shaking/Enqueuer.java

diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index 9938f36..7835cc6 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -4121,16 +4121,19 @@
       this.enqueuer = enqueuer;
     }
 
+    @Deprecated
     @Override
     public DexDefinition definitionFor(DexReference reference) {
       return enqueuer.definitionFor(reference);
     }
 
+    @Deprecated
     @Override
     public DexEncodedField definitionFor(DexField field) {
       return enqueuer.definitionFor(field);
     }
 
+    @Deprecated
     @Override
     public DexEncodedMethod definitionFor(DexMethod method) {
       return enqueuer.definitionFor(method);