commit 2fcbc331d8a05e18111722315dd86225159108e4
author Clément Béra <clementbera@google.com> Wed Mar 12 11:00:34 2025 +0100
committer Clément Béra <clementbera@google.com> Wed Mar 12 03:17:21 2025 -0700
tree 425321588e87affd9e358595932d00ff790a4d91
parent c9e21aadc30a57a3ac99bd25281b9d6e1de202c3

Fix Synthetic cf code for AutoCloseable

Change-Id: Idd68d84e2d89e2e3df9118dfe8afd0918505d063

src/main/java/com/android/tools/r8/ir/synthetic/EmulateDispatchSyntheticCfCodeProvider.java

diff --git a/src/main/java/com/android/tools/r8/ir/synthetic/EmulateDispatchSyntheticCfCodeProvider.java b/src/main/java/com/android/tools/r8/ir/synthetic/EmulateDispatchSyntheticCfCodeProvider.java
index 9c34153..256dc6e 100644
--- a/src/main/java/com/android/tools/r8/ir/synthetic/EmulateDispatchSyntheticCfCodeProvider.java
+++ b/src/main/java/com/android/tools/r8/ir/synthetic/EmulateDispatchSyntheticCfCodeProvider.java
@@ -17,6 +17,8 @@
 import com.android.tools.r8.cf.code.CfLoad;
 import com.android.tools.r8.cf.code.CfReturn;
 import com.android.tools.r8.cf.code.CfReturnVoid;
+import com.android.tools.r8.cf.code.CfStackInstruction;
+import com.android.tools.r8.cf.code.CfStackInstruction.Opcode;
 import com.android.tools.r8.cf.code.frame.FrameType;
 import com.android.tools.r8.graph.AppView;
 import com.android.tools.r8.graph.CfCode;
@@ -121,21 +123,25 @@
     if (dispatchType == ALL_STATIC
         || appView.getSyntheticItems().isSynthetic(method.getHolderType())) {
       instructions.add(new CfInvoke(Opcodes.INVOKESTATIC, method, false));
-      return;
-    }
-    assert dispatchType == AUTO_CLOSEABLE;
-    // The type method.getHolderType() may not resolve if compiled without android library, for
-    // example, with the jdk as android.jar.
-    if (method
-        .getHolderType()
-        .isIdenticalTo(appView.dexItemFactory().javaUtilConcurrentExecutorServiceType)) {
-      assert appView.definitionFor(method.getHolderType()) == null
-          || appView.definitionFor(method.getHolderType()).isInterface();
-      instructions.add(new CfInvoke(Opcodes.INVOKEINTERFACE, method, true));
     } else {
-      assert appView.definitionFor(method.getHolderType()) == null
-          || !appView.definitionFor(method.getHolderType()).isInterface();
-      instructions.add(new CfInvoke(Opcodes.INVOKEVIRTUAL, method, false));
+      assert dispatchType == AUTO_CLOSEABLE;
+      // The type method.getHolderType() may not resolve if compiled without android library, for
+      // example, with the jdk as android.jar.
+      if (method
+          .getHolderType()
+          .isIdenticalTo(appView.dexItemFactory().javaUtilConcurrentExecutorServiceType)) {
+        assert appView.definitionFor(method.getHolderType()) == null
+            || appView.definitionFor(method.getHolderType()).isInterface();
+        instructions.add(new CfInvoke(Opcodes.INVOKEINTERFACE, method, true));
+      } else {
+        assert appView.definitionFor(method.getHolderType()) == null
+            || !appView.definitionFor(method.getHolderType()).isInterface();
+        instructions.add(new CfInvoke(Opcodes.INVOKEVIRTUAL, method, false));
+      }
+    }
+    if (interfaceMethod.getReturnType().isVoidType() && !method.getReturnType().isVoidType()) {
+      Opcode opcode = method.getReturnType().isWideType() ? Opcode.Pop2 : Opcode.Pop;
+      instructions.add(new CfStackInstruction(opcode));
     }
   }