commit 838b49ee1e23587f3a8b6fe99356ae00bebd9523
author Morten Krogh-Jespersen <mkroghj@google.com> Thu Feb 02 13:39:48 2023 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Thu Feb 02 12:40:15 2023 +0000
tree 7e7374c18e683c239b07604e875cbef30dcbb5a5
parent 17a901d5457baeff56481ad030bf57ee1364c063

[Retrace] Account for void return type

Bug: b/267413327
Change-Id: I0eef1c57dbb3bf919e1fb6f9fad614ef3f785a5a

src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java

diff --git a/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java b/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java
index db604e3..06fc0f2 100644
--- a/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java
+++ b/src/main/java/com/android/tools/r8/naming/mappinginformation/ResidualSignatureMappingInformation.java
@@ -111,7 +111,9 @@
     public static ResidualMethodSignatureMappingInformation deserialize(String signature) {
       String[] argumentTypeDescriptors = DescriptorUtils.getArgumentTypeDescriptors(signature);
       String returnTypeDescriptor = DescriptorUtils.getReturnTypeDescriptor(signature);
-      boolean isValid = DescriptorUtils.isDescriptor(returnTypeDescriptor);
+      boolean isValid =
+          DescriptorUtils.isDescriptor(returnTypeDescriptor)
+              || DescriptorUtils.isVoidDescriptor(returnTypeDescriptor);
       for (String argumentTypeDescriptor : argumentTypeDescriptors) {
         isValid &= DescriptorUtils.isDescriptor(argumentTypeDescriptor);
       }