commit 04562d5791cb71ebfb8365436748d3f227318230
author Clément Béra <clementbera@google.com> Wed Jun 02 08:22:33 2021 +0000
committer Clément Béra <clementbera@google.com> Wed Jun 02 08:22:33 2021 +0000
tree d5eb99f9dfc36dc1abe2db33b1d11352ac5114f2
parent 3c940e6497a8f87a9835a199e583728391fdd3b3

No need to go through IR for interface method desugaring

Change-Id: I48199e21e9a591682c7750987fd889e0e2321bc2

src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
index 5dd5114..200ebd8 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/IRConverter.java
@@ -591,7 +591,6 @@
           new NeedsIRDesugarUseRegistry(
               method,
               appView,
-              interfaceMethodRewriter,
               desugaredLibraryAPIConverter);
       method.registerCodeReferences(useRegistry);
       return useRegistry.needsDesugaring();

src/main/java/com/android/tools/r8/ir/conversion/NeedsIRDesugarUseRegistry.java

diff --git a/src/main/java/com/android/tools/r8/ir/conversion/NeedsIRDesugarUseRegistry.java b/src/main/java/com/android/tools/r8/ir/conversion/NeedsIRDesugarUseRegistry.java
index 5a4dec1..cb8eeab 100644
--- a/src/main/java/com/android/tools/r8/ir/conversion/NeedsIRDesugarUseRegistry.java
+++ b/src/main/java/com/android/tools/r8/ir/conversion/NeedsIRDesugarUseRegistry.java
@@ -4,12 +4,6 @@
 
 package com.android.tools.r8.ir.conversion;
 
-import static com.android.tools.r8.ir.code.Invoke.Type.DIRECT;
-import static com.android.tools.r8.ir.code.Invoke.Type.INTERFACE;
-import static com.android.tools.r8.ir.code.Invoke.Type.STATIC;
-import static com.android.tools.r8.ir.code.Invoke.Type.SUPER;
-import static com.android.tools.r8.ir.code.Invoke.Type.VIRTUAL;
-
 import com.android.tools.r8.graph.AppView;
 import com.android.tools.r8.graph.DexCallSite;
 import com.android.tools.r8.graph.DexField;
@@ -17,25 +11,20 @@
 import com.android.tools.r8.graph.DexType;
 import com.android.tools.r8.graph.ProgramMethod;
 import com.android.tools.r8.graph.UseRegistry;
-import com.android.tools.r8.ir.code.Invoke.Type;
 import com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter;
-import com.android.tools.r8.ir.desugar.itf.InterfaceMethodRewriter;
 
 class NeedsIRDesugarUseRegistry extends UseRegistry {
 
   private boolean needsDesugaring = false;
   private final ProgramMethod context;
-  private final InterfaceMethodRewriter interfaceMethodRewriter;
   private final DesugaredLibraryAPIConverter desugaredLibraryAPIConverter;
 
   public NeedsIRDesugarUseRegistry(
       ProgramMethod method,
       AppView<?> appView,
-      InterfaceMethodRewriter interfaceMethodRewriter,
       DesugaredLibraryAPIConverter desugaredLibraryAPIConverter) {
     super(appView.dexItemFactory());
     this.context = method;
-    this.interfaceMethodRewriter = interfaceMethodRewriter;
     this.desugaredLibraryAPIConverter = desugaredLibraryAPIConverter;
   }
 
@@ -54,24 +43,14 @@
 
   @Override
   public void registerInvokeVirtual(DexMethod method) {
-    registerInterfaceMethodRewriting(method, VIRTUAL);
     registerDesugaredLibraryAPIConverter(method);
   }
 
   @Override
   public void registerInvokeDirect(DexMethod method) {
-    registerInterfaceMethodRewriting(method, DIRECT);
     registerDesugaredLibraryAPIConverter(method);
   }
 
-  private void registerInterfaceMethodRewriting(DexMethod method, Type invokeType) {
-    if (!needsDesugaring) {
-      needsDesugaring =
-          interfaceMethodRewriter != null
-              && interfaceMethodRewriter.needsRewriting(method, invokeType, context);
-    }
-  }
-
   private void registerDesugaredLibraryAPIConverter(DexMethod method) {
     if (!needsDesugaring) {
       needsDesugaring =
@@ -82,21 +61,16 @@
 
   @Override
   public void registerInvokeStatic(DexMethod method) {
-    registerInterfaceMethodRewriting(method, STATIC);
     registerDesugaredLibraryAPIConverter(method);
   }
 
   @Override
   public void registerInvokeInterface(DexMethod method) {
-    registerInterfaceMethodRewriting(method, INTERFACE);
     registerDesugaredLibraryAPIConverter(method);
   }
 
   @Override
   public void registerInvokeStatic(DexMethod method, boolean itf) {
-    if (itf) {
-      needsDesugaring = true;
-    }
     registerInvokeStatic(method);
   }
 
@@ -108,7 +82,6 @@
 
   @Override
   public void registerInvokeSuper(DexMethod method) {
-    registerInterfaceMethodRewriting(method, SUPER);
     registerDesugaredLibraryAPIConverter(method);
   }