commit d4c602b1ffc2eaa6db45d44713fcdc57efd5cc7d
author Christoffer Quist Adamsen <christofferqa@google.com> Mon May 11 15:05:55 2020 +0200
committer Christoffer Quist Adamsen <christofferqa@google.com> Mon May 11 15:05:55 2020 +0200
tree 151f192f02778eabb115baca7cdf58d1989e82e9
parent abc5a08f9adf9e726b8a7186b4c49dccfe86df63

Update synthesized $load method names

Bug: 156054499
Change-Id: Id91daecf943c84317d2af9dfa3a2bd2c74134ab0

src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java

diff --git a/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java b/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java
index 1379679..50666b6 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/ServiceLoaderRewriter.java
@@ -199,7 +199,11 @@
     String methodNamePrefix =
         SERVICE_LOADER_METHOD_PREFIX_NAME
             + "$"
-            + StringUtils.replaceAll(context.getReference().qualifiedName(), ".", "$")
+            + StringUtils.replaceAll(context.getHolderType().toSourceString(), ".", "$")
+            + "$"
+            + (context.getDefinition().isInitializer()
+                ? (context.getDefinition().isClassInitializer() ? "$clinit" : "$init")
+                : context.getReference().name.toSourceString())
             + "$"
             + hashCode.substring(0, Math.min(SERVICE_LOADER_METHOD_HASH_LENGTH, hashCode.length()))
             + "$";