commit fedb460b9557ed5d51845b35f0a7d8aa4ecdb9f6
author Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 12 11:16:22 2021 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon Apr 12 11:16:22 2021 +0200
tree be297c22cac9e96386077a0cb9d0a9ecba304c14
parent 6305cbbbaf6f520f1e70146424c6b21afbb7195f

Fix attempt to create ValueType from void type in ForwardMethodBuilder

Bug: 183734568
Change-Id: I9239c0299dbfddd77226c2c800a0a5bb838067de

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

diff --git a/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java b/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java
index 48536cc..4a24a4b 100644
--- a/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java
+++ b/src/main/java/com/android/tools/r8/ir/synthetic/ForwardMethodBuilder.java
@@ -291,7 +291,9 @@
       assert !sourceMethod.getReturnType().isVoidType();
       assert targetMethod.getReturnType().isVoidType();
       assert invokeType == InvokeType.SPECIAL;
-    } else if (castResult) {
+    } else if (castResult
+        && !sourceMethod.getReturnType().isVoidType()
+        && !targetMethod.getReturnType().isVoidType()) {
       assert ValueType.fromDexType(sourceMethod.getReturnType())
           == ValueType.fromDexType(targetMethod.getReturnType());
     } else {