commit 9228ea62ef74ca93b346ea7f5b35873ceea7e24e
author Rico Wind <ricow@google.com> Tue Nov 10 13:32:05 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Nov 10 13:32:05 2020 +0000
tree ff21d5d0e6ff2c0e1904c30c4d3d177b5040e073
parent 322a1a80c13eb1b3d5a091d0da580b29c3c6d38e
parent 734fa8c6a70513527283f39d00b83540b63f018e

Update D8 and R8 to 3.0.4-dev am: 734fa8c6a7

Original change: https://android-review.googlesource.com/c/platform/prebuilts/r8/+/1492921

Change-Id: Ia3e3b218415e98c23072fae0a6c859ee961d36ae

r8.jar

diff --git a/r8.jar b/r8.jar
index 29724cf..d8d6ac8 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ

r8.jar.map

diff --git a/r8.jar.map b/r8.jar.map
index f5c8e06..df19367 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,7 +1,7 @@
 # compiler: R8
-# compiler_version: 3.0.2-dev
+# compiler_version: 3.0.4-dev
 # compiler_hash: engineering
-# pg_map_id: fddc995
+# pg_map_id: b012e23
 # common_typos_disable
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.f1:
     boolean $assertionsDisabled -> c
@@ -117,13 +117,13 @@
     1:2:void <clinit>():53:54 -> <clinit>
     1:1:void <init>():51:51 -> <init>
     1:1:java.lang.String formatMethod(com.android.tools.r8.graph.DexMethod):66:66 -> a
-    2:110:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
-    2:110:java.lang.String formatMethod(com.android.tools.r8.graph.DexMethod):69 -> a
-    111:111:java.lang.String formatMethod(com.android.tools.r8.graph.DexMethod):69:69 -> a
-    112:112:void lambda$run$1(com.android.tools.r8.BackportedMethodListCommand,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):88:88 -> a
-    113:123:void lambda$run$1(com.android.tools.r8.BackportedMethodListCommand,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):87:97 -> a
-    124:125:void lambda$run$0(com.android.tools.r8.BackportedMethodListCommand,java.lang.String):95:96 -> a
-    126:126:void lambda$main$2(java.lang.String[]):109:109 -> a
+    2:114:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:112 -> a
+    2:114:java.lang.String formatMethod(com.android.tools.r8.graph.DexMethod):69 -> a
+    115:115:java.lang.String formatMethod(com.android.tools.r8.graph.DexMethod):69:69 -> a
+    116:116:void lambda$run$1(com.android.tools.r8.BackportedMethodListCommand,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):88:88 -> a
+    117:127:void lambda$run$1(com.android.tools.r8.BackportedMethodListCommand,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):87:97 -> a
+    128:129:void lambda$run$0(com.android.tools.r8.BackportedMethodListCommand,java.lang.String):95:96 -> a
+    130:130:void lambda$main$2(java.lang.String[]):109:109 -> a
     1:1:void main(java.lang.String[]):109:109 -> main
     1:13:void run(com.android.tools.r8.BackportedMethodListCommand):73:85 -> run
     14:14:void com.android.tools.r8.utils.ExceptionUtils.withD8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):55:55 -> run
@@ -520,20 +520,20 @@
     79:79:com.android.tools.r8.graph.DexApplication com.android.tools.r8.graph.LazyLoadedDexApplication$Builder.build():193:193 -> a
     79:79:com.android.tools.r8.graph.DexApplication rewriteNonDexInputs(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication):386 -> a
     80:80:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
-    81:81:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):376:376 -> a
+    81:81:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):375:375 -> a
     81:81:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394 -> a
     82:82:void optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
     1:1:void lambda$run$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):119:119 -> b
     1:3:void lambda$runForTesting$3(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):158:160 -> c
     1:18:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):178:195 -> d
     19:34:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):194:209 -> d
-    35:35:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):376:376 -> d
+    35:35:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):375:375 -> d
     35:35:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209 -> d
     36:87:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):209:260 -> d
-    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> d
+    88:88:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> d
     88:88:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):261 -> d
     89:99:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):264:274 -> d
-    100:100:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():448:448 -> d
+    100:100:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():449:449 -> d
     100:100:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276 -> d
     101:120:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276:295 -> d
     121:126:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):294:299 -> d
@@ -754,7 +754,7 @@
     20:20:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):96:96 -> a
     21:21:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
     21:21:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
-    22:22:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):376:376 -> a
+    22:22:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):375:375 -> a
     22:22:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394 -> a
     22:22:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):99 -> a
     23:23:void com.android.tools.r8.D8.optimize(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):394:394 -> a
@@ -763,10 +763,10 @@
     44:44:java.lang.RuntimeException com.android.tools.r8.utils.ExceptionUtils.unwrapExecutionException(java.util.concurrent.ExecutionException):216:216 -> a
     44:44:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115 -> a
     45:50:void runInternal(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.lang.Boolean,java.util.Map):115:120 -> a
-    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    51:51:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
     51:51:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41 -> a
     52:52:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):41:41 -> a
-    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
     53:53:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42 -> a
     54:71:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):42:59 -> a
     72:83:com.android.tools.r8.graph.DexProgramClass keepFirstProgramClassConflictResolver(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):46:57 -> a
@@ -1109,7 +1109,7 @@
     570:570:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DirectMappedDexApplication.programDefinitionFor(com.android.tools.r8.graph.DexType):83:83 -> a
     570:570:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):238 -> a
     571:571:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):243:243 -> a
-    572:572:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
+    572:572:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> a
     572:572:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):244 -> a
     573:583:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):247:257 -> a
     584:637:com.android.tools.r8.GenerateLintFiles$SupportedMethods collectSupportedMethods(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate):240:293 -> a
@@ -1122,31 +1122,31 @@
     645:674:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):319:348 -> a
     675:691:void writeLintFiles(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.GenerateLintFiles$SupportedMethods):347:363 -> a
     692:700:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):324:332 -> a
-    701:809:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
-    701:809:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):336 -> a
-    810:810:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):336:336 -> a
-    811:821:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):332:342 -> a
-    822:835:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):371:384 -> a
-    836:836:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):381:381 -> a
-    837:837:void run(int):399:399 -> a
-    838:838:void run(int):398:398 -> a
-    839:839:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
-    840:845:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):402:407 -> a
-    846:847:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):463:464 -> a
-    846:847:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):441 -> a
-    846:847:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):754 -> a
-    848:862:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):749:763 -> a
-    863:863:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):752:752 -> a
-    864:865:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):759:760 -> a
-    866:877:void generateDesugaredLibraryApisDocumetation():767:778 -> a
-    878:878:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):772:772 -> a
-    879:879:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):776:776 -> a
-    880:880:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):780:780 -> a
-    881:881:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):785:785 -> a
-    882:883:void main(java.lang.String[]):789:790 -> a
-    884:888:void run():389:393 -> a
-    884:888:void main(java.lang.String[]):790 -> a
-    889:896:void main(java.lang.String[]):793:800 -> a
+    701:813:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:112 -> a
+    701:813:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):336 -> a
+    814:814:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):336:336 -> a
+    815:825:void lambda$writeLintFiles$3(com.android.tools.r8.GenerateLintFiles$SupportedMethods,java.util.List,com.android.tools.r8.graph.LazyLoadedDexApplication$Builder,com.android.tools.r8.graph.DexClass,java.util.List):332:342 -> a
+    826:839:void generateLintFiles(com.android.tools.r8.utils.AndroidApiLevel,java.util.function.Predicate,java.util.function.BiPredicate):371:384 -> a
+    840:840:boolean lambda$generateLintFiles$4(java.util.function.BiPredicate,com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):381:381 -> a
+    841:841:void run(int):399:399 -> a
+    842:842:void run(int):398:398 -> a
+    843:843:boolean lambda$run$5(com.android.tools.r8.utils.AndroidApiLevel):400:400 -> a
+    844:849:boolean lambda$run$6(com.android.tools.r8.utils.AndroidApiLevel,com.android.tools.r8.graph.DexEncodedMethod):402:407 -> a
+    850:851:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.addField(com.android.tools.r8.graph.DexEncodedField):463:464 -> a
+    850:851:com.android.tools.r8.GenerateLintFiles$SourceBuilder com.android.tools.r8.GenerateLintFiles$SourceBuilder.access$300(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):441 -> a
+    850:851:void lambda$generateClassHTML$8(com.android.tools.r8.GenerateLintFiles$SourceBuilder,com.android.tools.r8.graph.DexEncodedField):754 -> a
+    852:866:void generateClassHTML(java.io.PrintStream,com.android.tools.r8.graph.DexClass,boolean,java.util.function.Predicate,java.util.function.Predicate):749:763 -> a
+    867:867:boolean lambda$generateClassHTML$7(com.android.tools.r8.graph.DexEncodedField):752:752 -> a
+    868:869:boolean lambda$generateClassHTML$9(com.android.tools.r8.graph.DexEncodedMethod):759:760 -> a
+    870:881:void generateDesugaredLibraryApisDocumetation():767:778 -> a
+    882:882:void lambda$generateDesugaredLibraryApisDocumetation$15(java.io.PrintStream,com.android.tools.r8.graph.DexClass):772:772 -> a
+    883:883:boolean lambda$generateDesugaredLibraryApisDocumetation$16(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):776:776 -> a
+    884:884:void lambda$generateDesugaredLibraryApisDocumetation$20(java.io.PrintStream,com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass):780:780 -> a
+    885:885:boolean lambda$generateDesugaredLibraryApisDocumetation$19(com.android.tools.r8.GenerateLintFiles$SupportedMethods,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):785:785 -> a
+    886:887:void main(java.lang.String[]):789:790 -> a
+    888:892:void run():389:393 -> a
+    888:892:void main(java.lang.String[]):790 -> a
+    893:900:void main(java.lang.String[]):793:800 -> a
     boolean lambda$generateDesugaredLibraryApisDocumetation$11(com.android.tools.r8.graph.DexEncodedMethod) -> b
     boolean lambda$generateDesugaredLibraryApisDocumetation$13(com.android.tools.r8.graph.DexEncodedField) -> b
     1:1:java.util.List lambda$collectSupportedMethods$1(com.android.tools.r8.graph.DexClass):273:273 -> b
@@ -1246,7 +1246,7 @@
     40:40:java.lang.String lambda$run$0(com.android.tools.r8.graph.DexType):77:77 -> a
     41:45:java.lang.Iterable lambda$run$2(com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.graph.AppView):89:93 -> a
     46:48:void lambda$run$3(com.android.tools.r8.utils.Box,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):159:161 -> a
-    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    49:49:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     49:49:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):95 -> a
     50:51:void lambda$run$1(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):96:97 -> a
     1:13:void main(java.lang.String[]):168:180 -> main
@@ -1344,12 +1344,12 @@
     14:14:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):96:96 -> a
     15:30:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):113:128 -> a
     15:30:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
-    31:31:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):371:371 -> a
+    31:31:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):370:370 -> a
     31:31:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):128 -> a
     31:31:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
     32:44:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):128:140 -> a
     32:44:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
-    45:45:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():448:448 -> a
+    45:45:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():449:449 -> a
     45:45:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141 -> a
     45:45:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):97 -> a
     46:54:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):141:149 -> a
@@ -1510,116 +1510,117 @@
     com.android.tools.r8.utils.Timing timing -> b
     com.android.tools.r8.utils.InternalOptions options -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():168:168 -> <clinit>
-    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):174:179 -> <init>
+    1:1:void <clinit>():169:169 -> <clinit>
+    1:6:void <init>(com.android.tools.r8.utils.InternalOptions):175:180 -> <init>
     com.android.tools.r8.graph.DexApplication lambda$run$5(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
-    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):212:212 -> a
-    2:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):225:232 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    10:10:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):233 -> a
-    11:11:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):234:234 -> a
-    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():448:448 -> a
-    12:12:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):235 -> a
-    13:26:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):235:248 -> a
-    27:28:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):254:255 -> a
-    29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    29:29:void lambda$run$6(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):672 -> a
-    30:31:void lambda$run$6(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):673:674 -> a
-    32:33:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):261:262 -> a
+    1:1:void lambda$run$0(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):213:213 -> a
+    2:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):226:233 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    10:10:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):234 -> a
+    11:11:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):235:235 -> a
+    12:12:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():449:449 -> a
+    12:12:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):236 -> a
+    13:26:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.ProguardMapSupplier):236:249 -> a
+    27:28:java.util.Set filterMissingClasses(java.util.Set,com.android.tools.r8.shaking.ProguardClassFilter):255:256 -> a
+    29:29:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    29:29:void lambda$run$6(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):674 -> a
+    30:31:void lambda$run$6(com.android.tools.r8.graph.AppView,java.util.ArrayList,com.android.tools.r8.graph.DexType):675:676 -> a
+    32:33:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):262:263 -> a
     34:34:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> a
-    34:34:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):262 -> a
-    35:35:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):279:279 -> a
-    36:87:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):283:334 -> a
-    88:115:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):333:360 -> a
-    116:120:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):359:363 -> a
-    121:121:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):362:362 -> a
-    122:133:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):361:372 -> a
-    134:136:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):371:373 -> a
-    137:171:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):367:401 -> a
-    172:189:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):400:417 -> a
-    190:249:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):416:475 -> a
-    250:489:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):472:711 -> a
-    490:495:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):709:714 -> a
-    496:517:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):707:728 -> a
-    518:534:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):726:742 -> a
-    535:549:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):739:753 -> a
-    550:594:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):752:796 -> a
-    595:648:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):779:832 -> a
-    649:666:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):831:848 -> a
-    667:681:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):845:859 -> a
-    682:770:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):858:946 -> a
-    771:785:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):896:910 -> a
-    786:816:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):907:937 -> a
-    817:833:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):930:946 -> a
-    834:834:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):617:617 -> a
-    835:1344:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):437:946 -> a
-    1345:1347:void lambda$run$2(com.android.tools.r8.graph.DexType):338:338 -> a
-    1348:1348:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):409:409 -> a
-    1349:1353:java.lang.Iterable lambda$run$7(com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.graph.AppView):666:670 -> a
-    1354:1354:void lambda$run$8(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):719:719 -> a
-    1355:1355:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$9(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):727:727 -> a
-    1356:1356:void lambda$run$11(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):791:791 -> a
-    1357:1357:void lambda$run$12(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):798:798 -> a
-    1358:1358:void lambda$run$13(java.lang.String):891:891 -> a
-    1359:1359:boolean lambda$run$14(com.android.tools.r8.graph.DexProgramClass):897:897 -> a
-    1360:1361:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):954:955 -> a
-    1362:1362:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):957:957 -> a
-    1363:1374:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):960:971 -> a
-    1375:1375:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):983:983 -> a
-    1375:1375:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):971 -> a
-    1376:1376:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    1376:1376:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):984 -> a
-    1376:1376:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):971 -> a
-    1377:1378:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):987:988 -> a
-    1377:1378:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):971 -> a
-    1379:1380:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):973:974 -> a
-    1381:1385:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):994:998 -> a
-    1381:1385:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974 -> a
-    1386:1386:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
-    1386:1386:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):998 -> a
-    1386:1386:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974 -> a
-    1387:1387:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):998:998 -> a
-    1387:1387:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):974 -> a
-    1388:1396:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1010:1018 -> a
-    1397:1402:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1016:1021 -> a
-    1403:1403:boolean com.android.tools.r8.utils.InternalOptions.isClassMergingExtensionRequired():573:573 -> a
-    1403:1403:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1021 -> a
-    1404:1406:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):67:69 -> a
-    1404:1406:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1022 -> a
-    1407:1408:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1028:1029 -> a
-    1409:1409:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1027:1027 -> a
-    1410:1425:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1026:1041 -> a
-    1426:1426:void lambda$runEnqueuer$17(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1039:1039 -> a
-    1427:1429:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1060:1062 -> a
-    1430:1457:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1061:1088 -> a
-    1458:1468:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1086:1096 -> a
-    1469:1473:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1093:1097 -> a
-    1474:1477:boolean verifyNoJarApplicationReaders(java.util.Collection):1101:1104 -> a
-    1478:1478:void lambda$run$19(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1126:1126 -> a
-    1479:1479:void lambda$main$20(java.lang.String[]):1142:1142 -> a
+    34:34:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):263 -> a
+    35:35:com.android.tools.r8.graph.DirectMappedDexApplication getDirectApp(com.android.tools.r8.graph.AppView):280:280 -> a
+    36:77:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):284:325 -> a
+    78:91:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):324:337 -> a
+    92:119:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):336:363 -> a
+    120:124:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):362:366 -> a
+    125:125:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):365:365 -> a
+    126:137:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):364:375 -> a
+    138:140:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):374:376 -> a
+    141:175:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):370:404 -> a
+    176:193:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):403:420 -> a
+    194:253:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):419:478 -> a
+    254:492:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):475:713 -> a
+    493:498:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):711:716 -> a
+    499:520:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):709:730 -> a
+    521:537:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):728:744 -> a
+    538:552:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):741:755 -> a
+    553:599:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):754:800 -> a
+    600:655:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):781:836 -> a
+    656:673:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):835:852 -> a
+    674:688:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):849:863 -> a
+    689:777:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):862:950 -> a
+    778:792:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):900:914 -> a
+    793:823:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):911:941 -> a
+    824:840:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):934:950 -> a
+    841:841:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):619:619 -> a
+    842:1352:void run(com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):440:950 -> a
+    1353:1355:void lambda$run$2(com.android.tools.r8.graph.DexType):341:341 -> a
+    1356:1356:void lambda$run$4(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):412:412 -> a
+    1357:1361:java.lang.Iterable lambda$run$7(com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.graph.AppView):668:672 -> a
+    1362:1362:void lambda$run$8(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):721:721 -> a
+    1363:1363:com.android.tools.r8.shaking.TreePrunerConfiguration lambda$run$9(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):729:729 -> a
+    1364:1364:void lambda$run$11(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):795:795 -> a
+    1365:1365:void lambda$run$12(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):802:802 -> a
+    1366:1366:void lambda$run$13(java.lang.String):895:895 -> a
+    1367:1367:boolean lambda$run$14(com.android.tools.r8.graph.DexProgramClass):901:901 -> a
+    1368:1369:boolean verifyMovedMethodsHaveOriginalMethodPosition(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication):958:959 -> a
+    1370:1370:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$16(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):961:961 -> a
+    1371:1382:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):964:975 -> a
+    1383:1383:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):987:987 -> a
+    1383:1383:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):975 -> a
+    1384:1384:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    1384:1384:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):988 -> a
+    1384:1384:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):975 -> a
+    1385:1386:boolean verifyOriginalMethodInPosition(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):991:992 -> a
+    1385:1386:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):975 -> a
+    1387:1388:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):977:978 -> a
+    1389:1393:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):998:1002 -> a
+    1389:1393:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):978 -> a
+    1394:1394:boolean com.android.tools.r8.graph.DexDebugEvent.isSetInlineFrame():0:0 -> a
+    1394:1394:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):1002 -> a
+    1394:1394:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):978 -> a
+    1395:1395:boolean verifyOriginalMethodInDebugInfo(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):1002:1002 -> a
+    1395:1395:void lambda$verifyMovedMethodsHaveOriginalMethodPosition$15(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):978 -> a
+    1396:1404:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1014:1022 -> a
+    1405:1410:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1020:1025 -> a
+    1411:1411:boolean com.android.tools.r8.utils.InternalOptions.isClassMergingExtensionRequired():574:574 -> a
+    1411:1411:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1025 -> a
+    1412:1414:void com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder.attach(com.android.tools.r8.shaking.Enqueuer):67:69 -> a
+    1412:1414:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1026 -> a
+    1415:1416:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1032:1033 -> a
+    1417:1417:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1031:1031 -> a
+    1418:1433:com.android.tools.r8.graph.AppView runEnqueuer(com.android.tools.r8.shaking.AnnotationRemover$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder):1030:1045 -> a
+    1434:1434:void lambda$runEnqueuer$17(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):1043:1043 -> a
+    1435:1437:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1064:1066 -> a
+    1438:1465:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1065:1092 -> a
+    1466:1476:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1090:1100 -> a
+    1477:1481:void processWhyAreYouKeepingAndCheckDiscarded(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.function.Supplier,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,boolean,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):1097:1101 -> a
+    1482:1485:boolean verifyNoJarApplicationReaders(java.util.Collection):1105:1108 -> a
+    1486:1486:void lambda$run$19(com.android.tools.r8.R8Command,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):1130:1130 -> a
+    1487:1487:void lambda$main$20(java.lang.String[]):1146:1146 -> a
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> b
-    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266:268 -> b
-    4:4:java.lang.Iterable lambda$run$10(com.android.tools.r8.graph.AppView):754:754 -> b
-    5:5:void lambda$runEnqueuer$18(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1043:1043 -> b
-    6:7:void run(java.lang.String[]):1112:1113 -> b
+    1:3:void lambda$runForTesting$1(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):267:269 -> b
+    4:4:java.lang.Iterable lambda$run$10(com.android.tools.r8.graph.AppView):756:756 -> b
+    5:5:void lambda$runEnqueuer$18(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1047:1047 -> b
+    6:7:void run(java.lang.String[]):1116:1117 -> b
     8:8:void com.android.tools.r8.utils.SelfRetraceTest.test():25:25 -> b
-    8:8:void run(java.lang.String[]):1114 -> b
-    9:9:void run(java.lang.String[]):1115:1115 -> b
+    8:8:void run(java.lang.String[]):1118 -> b
+    9:9:void run(java.lang.String[]):1119:1119 -> b
     10:10:void com.android.tools.r8.utils.SelfRetraceTest.foo3():13:13 -> b
     10:10:void com.android.tools.r8.utils.SelfRetraceTest.foo2():17 -> b
     10:10:void com.android.tools.r8.utils.SelfRetraceTest.foo1():21 -> b
     10:10:void com.android.tools.r8.utils.SelfRetraceTest.test():26 -> b
-    10:10:void run(java.lang.String[]):1114 -> b
-    11:18:void run(java.lang.String[]):1118:1125 -> b
+    10:10:void run(java.lang.String[]):1118 -> b
+    11:18:void run(java.lang.String[]):1122:1129 -> b
     19:19:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> b
-    19:19:void run(java.lang.String[]):1125 -> b
-    20:20:void run(java.lang.String[]):1128:1128 -> b
-    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):275:275 -> c
-    1:5:void main(java.lang.String[]):1138:1142 -> main
-    1:3:void run(com.android.tools.r8.R8Command):191:193 -> run
-    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):207:210 -> run
+    19:19:void run(java.lang.String[]):1129 -> b
+    20:20:void run(java.lang.String[]):1132:1132 -> b
+    1:1:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):276:276 -> c
+    1:5:void main(java.lang.String[]):1142:1146 -> main
+    1:3:void run(com.android.tools.r8.R8Command):192:194 -> run
+    4:7:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):208:211 -> run
     8:8:void com.android.tools.r8.utils.ExceptionUtils.withR8CompilationHandler(com.android.tools.r8.utils.Reporter,com.android.tools.r8.utils.ExceptionUtils$CompileAction):60:60 -> run
-    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):209 -> run
+    8:8:void run(com.android.tools.r8.R8Command,java.util.concurrent.ExecutorService):210 -> run
 com.android.tools.r8.R8Command -> com.android.tools.r8.R8Command:
     java.lang.String synthesizedClassPrefix -> J
     java.util.List mainDexKeepRules -> t
@@ -1654,7 +1655,7 @@
     83:93:com.android.tools.r8.utils.InternalOptions getInternalOptions():906:916 -> b
     94:104:com.android.tools.r8.utils.InternalOptions getInternalOptions():913:923 -> b
     105:129:com.android.tools.r8.utils.InternalOptions getInternalOptions():920:944 -> b
-    130:130:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
+    130:130:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> b
     130:130:com.android.tools.r8.utils.InternalOptions getInternalOptions():949 -> b
     131:156:com.android.tools.r8.utils.InternalOptions getInternalOptions():950:975 -> b
     1:1:com.android.tools.r8.R8Command$Builder builder():685:685 -> builder
@@ -1735,12 +1736,12 @@
     1:4:com.android.tools.r8.R8Command makeCommand():469:472 -> p
     5:5:com.android.tools.r8.R8Command makeCommand():470:470 -> p
     1:22:com.android.tools.r8.R8Command makeR8Command():476:497 -> q
-    23:656:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():0:633 -> q
-    23:656:com.android.tools.r8.R8Command makeR8Command():498 -> q
-    657:718:com.android.tools.r8.R8Command makeR8Command():499:560 -> q
-    719:719:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():469:469 -> q
-    719:719:com.android.tools.r8.R8Command makeR8Command():561 -> q
-    720:754:com.android.tools.r8.R8Command makeR8Command():564:598 -> q
+    23:662:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():0:639 -> q
+    23:662:com.android.tools.r8.R8Command makeR8Command():498 -> q
+    663:724:com.android.tools.r8.R8Command makeR8Command():499:560 -> q
+    725:725:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():469:469 -> q
+    725:725:com.android.tools.r8.R8Command makeR8Command():561 -> q
+    726:760:com.android.tools.r8.R8Command makeR8Command():564:598 -> q
     1:1:com.android.tools.r8.R8Command$Builder skipDump():278:278 -> r
     1:1:com.android.tools.r8.R8Command$Builder setDesugaredLibraryKeepRuleConsumer(com.android.tools.r8.StringConsumer):269:269 -> setDesugaredLibraryKeepRuleConsumer
     1:1:com.android.tools.r8.R8Command$Builder setDisableMinification(boolean):176:176 -> setDisableMinification
@@ -1893,63 +1894,63 @@
     101:108:void processInvokeInstruction(com.android.tools.r8.code.Instruction):428:435 -> a
     101:108:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):220 -> a
     101:108:void visit():168 -> a
-    109:217:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
-    109:217:void processInvokeInstruction(com.android.tools.r8.code.Instruction):436 -> a
-    109:217:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):220 -> a
-    109:217:void visit():168 -> a
-    218:218:void processInvokeInstruction(com.android.tools.r8.code.Instruction):433:433 -> a
-    218:218:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):220 -> a
-    218:218:void visit():168 -> a
-    219:219:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):221:221 -> a
-    219:219:void visit():168 -> a
-    220:227:void processInvokeRangeInstruction(com.android.tools.r8.code.Instruction):449:456 -> a
-    220:227:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):222 -> a
-    220:227:void visit():168 -> a
-    228:336:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
-    228:336:void processInvokeRangeInstruction(com.android.tools.r8.code.Instruction):457 -> a
-    228:336:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):222 -> a
-    228:336:void visit():168 -> a
-    337:337:void processInvokeRangeInstruction(com.android.tools.r8.code.Instruction):454:454 -> a
-    337:337:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):222 -> a
-    337:337:void visit():168 -> a
-    338:338:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):223:223 -> a
-    338:338:void visit():168 -> a
-    339:341:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):281:283 -> a
-    339:341:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
-    339:341:void visit():168 -> a
-    342:342:com.android.tools.r8.graph.DexType com.android.tools.r8.code.NewArray.getType():62:62 -> a
-    342:342:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):284 -> a
-    342:342:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
-    342:342:void visit():168 -> a
-    343:351:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):284:292 -> a
-    343:351:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
-    343:351:void visit():168 -> a
-    352:352:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):291:291 -> a
-    352:352:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
-    352:352:void visit():168 -> a
-    353:359:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):225:231 -> a
-    353:359:void visit():168 -> a
-    360:365:boolean isIntArrayPayload(com.android.tools.r8.code.Instruction,java.util.Set):271:276 -> a
-    360:365:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):232 -> a
-    360:365:void visit():168 -> a
-    366:368:void processIntArrayPayload(com.android.tools.r8.code.Instruction):263:265 -> a
-    366:368:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):233 -> a
-    366:368:void visit():168 -> a
-    369:370:void visit():171:172 -> a
-    371:371:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):240:240 -> a
-    372:372:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():59:59 -> a
-    372:372:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):240 -> a
-    373:382:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):242:251 -> a
-    383:383:java.util.stream.Stream lambda$processAnnotations$0(com.android.tools.r8.graph.DexEncodedField):244:244 -> a
-    384:384:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():59:59 -> a
-    384:384:java.util.stream.Stream lambda$processAnnotations$0(com.android.tools.r8.graph.DexEncodedField):244 -> a
-    385:385:java.util.stream.Stream lambda$processAnnotations$1(com.android.tools.r8.graph.DexEncodedMethod):248:248 -> a
-    386:386:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():59:59 -> a
-    386:386:java.util.stream.Stream lambda$processAnnotations$1(com.android.tools.r8.graph.DexEncodedMethod):248 -> a
-    387:389:void lambda$processAnnotations$2(com.android.tools.r8.graph.DexAnnotation):253:255 -> a
-    390:408:void processAnnotationValue(com.android.tools.r8.graph.DexValue):296:314 -> a
-    409:409:void processAnnotationValue(com.android.tools.r8.graph.DexValue):310:310 -> a
-    410:410:boolean isGetStatic(com.android.tools.r8.code.Instruction):376:376 -> a
+    109:221:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:112 -> a
+    109:221:void processInvokeInstruction(com.android.tools.r8.code.Instruction):436 -> a
+    109:221:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):220 -> a
+    109:221:void visit():168 -> a
+    222:222:void processInvokeInstruction(com.android.tools.r8.code.Instruction):433:433 -> a
+    222:222:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):220 -> a
+    222:222:void visit():168 -> a
+    223:223:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):221:221 -> a
+    223:223:void visit():168 -> a
+    224:231:void processInvokeRangeInstruction(com.android.tools.r8.code.Instruction):449:456 -> a
+    224:231:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):222 -> a
+    224:231:void visit():168 -> a
+    232:344:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:112 -> a
+    232:344:void processInvokeRangeInstruction(com.android.tools.r8.code.Instruction):457 -> a
+    232:344:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):222 -> a
+    232:344:void visit():168 -> a
+    345:345:void processInvokeRangeInstruction(com.android.tools.r8.code.Instruction):454:454 -> a
+    345:345:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):222 -> a
+    345:345:void visit():168 -> a
+    346:346:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):223:223 -> a
+    346:346:void visit():168 -> a
+    347:349:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):281:283 -> a
+    347:349:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
+    347:349:void visit():168 -> a
+    350:350:com.android.tools.r8.graph.DexType com.android.tools.r8.code.NewArray.getType():62:62 -> a
+    350:350:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):284 -> a
+    350:350:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
+    350:350:void visit():168 -> a
+    351:359:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):284:292 -> a
+    351:359:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
+    351:359:void visit():168 -> a
+    360:360:void processFillArray(com.android.tools.r8.code.Instruction[],int,java.util.Set):291:291 -> a
+    360:360:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):224 -> a
+    360:360:void visit():168 -> a
+    361:367:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):225:231 -> a
+    361:367:void visit():168 -> a
+    368:373:boolean isIntArrayPayload(com.android.tools.r8.code.Instruction,java.util.Set):271:276 -> a
+    368:373:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):232 -> a
+    368:373:void visit():168 -> a
+    374:376:void processIntArrayPayload(com.android.tools.r8.code.Instruction):263:265 -> a
+    374:376:void processMethod(com.android.tools.r8.graph.DexEncodedMethod):233 -> a
+    374:376:void visit():168 -> a
+    377:378:void visit():171:172 -> a
+    379:379:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):240:240 -> a
+    380:380:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():59:59 -> a
+    380:380:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):240 -> a
+    381:390:void processAnnotations(com.android.tools.r8.graph.DexProgramClass):242:251 -> a
+    391:391:java.util.stream.Stream lambda$processAnnotations$0(com.android.tools.r8.graph.DexEncodedField):244:244 -> a
+    392:392:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():59:59 -> a
+    392:392:java.util.stream.Stream lambda$processAnnotations$0(com.android.tools.r8.graph.DexEncodedField):244 -> a
+    393:393:java.util.stream.Stream lambda$processAnnotations$1(com.android.tools.r8.graph.DexEncodedMethod):248:248 -> a
+    394:394:java.util.stream.Stream com.android.tools.r8.graph.DexAnnotationSet.stream():59:59 -> a
+    394:394:java.util.stream.Stream lambda$processAnnotations$1(com.android.tools.r8.graph.DexEncodedMethod):248 -> a
+    395:397:void lambda$processAnnotations$2(com.android.tools.r8.graph.DexAnnotation):253:255 -> a
+    398:416:void processAnnotationValue(com.android.tools.r8.graph.DexValue):296:314 -> a
+    417:417:void processAnnotationValue(com.android.tools.r8.graph.DexValue):310:310 -> a
+    418:418:boolean isGetStatic(com.android.tools.r8.code.Instruction):376:376 -> a
     1:1:boolean isIntConstInstruction(com.android.tools.r8.code.Instruction):323:323 -> b
     1:1:boolean isInvokeInstruction(com.android.tools.r8.code.Instruction):419:419 -> c
     1:1:boolean isInvokeRangeInstruction(com.android.tools.r8.code.Instruction):440:440 -> d
@@ -1991,14 +1992,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,java.io.Writer,com.android.tools.r8.StringConsumer):190:192 -> <init>
     1:5:void accept(java.lang.String,com.android.tools.r8.DiagnosticsHandler):197:201 -> accept
     1:5:void finished(com.android.tools.r8.DiagnosticsHandler):207:211 -> finished
-com.android.tools.r8.StringResource -> com.android.tools.r8.internal.gz:
+com.android.tools.r8.StringResource -> com.android.tools.r8.internal.zz:
     java.lang.String getString() -> a
     1:1:com.android.tools.r8.StringResource fromString(java.lang.String,com.android.tools.r8.origin.Origin):26:26 -> a
     2:2:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37:37 -> a
     3:3:com.android.tools.r8.StringResource com.android.tools.r8.StringResource.fromFile(java.nio.file.Path,java.nio.charset.Charset):49:49 -> a
     3:3:com.android.tools.r8.StringResource fromFile(java.nio.file.Path):37 -> a
-com.android.tools.r8.StringResource$1 -> com.android.tools.r8.internal.gz$a:
-com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.gz$b:
+com.android.tools.r8.StringResource$1 -> com.android.tools.r8.internal.zz$a:
+com.android.tools.r8.StringResource$FileResource -> com.android.tools.r8.internal.zz$b:
     java.nio.charset.Charset charset -> c
     java.nio.file.Path file -> b
     com.android.tools.r8.origin.Origin origin -> d
@@ -2008,7 +2009,7 @@
     2:7:void <init>(java.nio.file.Path,java.nio.charset.Charset):87:92 -> <init>
     1:3:java.lang.String getString():103:105 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():97:97 -> getOrigin
-com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.gz$c:
+com.android.tools.r8.StringResource$StringContentResource -> com.android.tools.r8.internal.zz$c:
     com.android.tools.r8.origin.Origin origin -> b
     boolean $assertionsDisabled -> a
     java.lang.String content -> c
@@ -2029,7 +2030,7 @@
     1:1:java.lang.String getPreReleaseString():86:86 -> getPreReleaseString
     1:1:java.lang.String getVersionString():21:21 -> getVersionString
     1:1:boolean isDevelopmentVersion():106:106 -> isDevelopmentVersion
-com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.tx:
+com.android.tools.r8.algorithms.scc.SCC -> com.android.tools.r8.internal.Mx:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap discoverTime -> c
     java.util.Set unassignedSet -> d
     java.util.function.Function successors -> h
@@ -2296,7 +2297,7 @@
     1:1:java.util.List getMethods():102:102 -> f
     1:1:java.util.Set getSynthesizedTypes():588:588 -> g
     1:1:java.lang.String immutableListType():189:189 -> h
-com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.i4:
+com.android.tools.r8.cf.CfPrinter -> com.android.tools.r8.internal.j4:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap labelToIndex -> d
     java.util.List localsAtLabel -> e
     com.android.tools.r8.naming.ClassNameMapper mapper -> g
@@ -2366,59 +2367,59 @@
     127:128:void print(com.android.tools.r8.cf.code.CfArrayStore):381:382 -> a
     129:131:void print(com.android.tools.r8.cf.code.CfInvoke):386:388 -> a
     132:137:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):392:397 -> a
-    138:246:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
-    138:246:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):397 -> a
-    247:253:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):397:403 -> a
-    254:273:void print(com.android.tools.r8.cf.code.CfFrame):407:426 -> a
-    274:279:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):430:435 -> a
-    280:282:void print(com.android.tools.r8.cf.code.CfInstanceOf):440:442 -> a
-    283:285:void print(com.android.tools.r8.cf.code.CfCheckCast):446:448 -> a
-    286:301:void print(com.android.tools.r8.cf.code.CfFieldInstruction):452:467 -> a
-    302:302:void print(com.android.tools.r8.cf.code.CfFieldInstruction):458:458 -> a
-    303:312:void print(com.android.tools.r8.cf.code.CfFieldInstruction):455:464 -> a
-    313:321:void print(com.android.tools.r8.cf.code.CfFieldInstruction):461:469 -> a
-    322:327:void com.android.tools.r8.cf.CfPrinter.appendField(com.android.tools.r8.graph.DexField):741:746 -> a
-    322:327:void print(com.android.tools.r8.cf.code.CfFieldInstruction):469 -> a
-    328:329:void print(com.android.tools.r8.cf.code.CfFieldInstruction):470:471 -> a
-    330:334:void com.android.tools.r8.cf.CfPrinter.appendDescriptor(com.android.tools.r8.graph.DexType):712:716 -> a
-    330:334:void print(com.android.tools.r8.cf.code.CfFieldInstruction):471 -> a
-    335:337:void print(com.android.tools.r8.cf.code.CfNew):475:477 -> a
-    338:351:void print(com.android.tools.r8.cf.code.CfNewArray):481:494 -> a
-    352:355:void print(com.android.tools.r8.cf.code.CfMultiANewArray):500:503 -> a
-    356:360:void print(com.android.tools.r8.cf.code.CfPosition):526:530 -> a
-    361:362:void print(com.android.tools.r8.cf.code.CfGoto):535:536 -> a
-    363:367:void print(com.android.tools.r8.cf.code.CfIf):544:548 -> a
-    368:368:java.lang.String com.android.tools.r8.cf.CfPrinter.ifPostfix(com.android.tools.r8.ir.code.If$Type):540:540 -> a
-    368:368:void print(com.android.tools.r8.cf.code.CfIf):548 -> a
-    369:371:void print(com.android.tools.r8.cf.code.CfIf):548:550 -> a
-    372:375:void print(com.android.tools.r8.cf.code.CfIfCmp):554:557 -> a
-    376:376:java.lang.String com.android.tools.r8.cf.CfPrinter.ifPostfix(com.android.tools.r8.ir.code.If$Type):540:540 -> a
-    376:376:void print(com.android.tools.r8.cf.code.CfIfCmp):557 -> a
-    377:379:void print(com.android.tools.r8.cf.code.CfIfCmp):557:559 -> a
-    380:397:void print(com.android.tools.r8.cf.code.CfSwitch):563:580 -> a
-    398:398:void print(com.android.tools.r8.cf.code.CfLoad):584:584 -> a
-    399:400:void com.android.tools.r8.cf.CfPrinter.printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):601:602 -> a
-    399:400:void print(com.android.tools.r8.cf.code.CfLoad):584 -> a
-    401:401:void print(com.android.tools.r8.cf.code.CfStore):588:588 -> a
-    402:403:void com.android.tools.r8.cf.CfPrinter.printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):601:602 -> a
-    402:403:void print(com.android.tools.r8.cf.code.CfStore):588 -> a
-    404:409:void print(com.android.tools.r8.cf.code.CfIinc):592:597 -> a
-    410:422:char typePrefix(com.android.tools.r8.ir.code.ValueType):606:618 -> a
-    423:441:char typePrefix(com.android.tools.r8.ir.code.MemberType):623:641 -> a
-    442:444:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):664:666 -> a
-    445:447:void print(com.android.tools.r8.cf.code.CfConstMethodType):670:672 -> a
-    448:449:void print(com.android.tools.r8.cf.code.CfJsrRet):676:677 -> a
-    450:450:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):681:681 -> a
-    451:453:void indent():697:699 -> a
-    454:454:void appendComment(java.lang.String):708:708 -> a
-    455:463:void appendClass(com.android.tools.r8.graph.DexType):728:736 -> a
-    464:464:void appendClass(com.android.tools.r8.graph.DexType):735:735 -> a
-    465:465:void appendClass(com.android.tools.r8.graph.DexType):734:734 -> a
-    466:473:void appendMethod(com.android.tools.r8.graph.DexMethod):750:757 -> a
-    474:582:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:108 -> a
-    474:582:void appendMethod(com.android.tools.r8.graph.DexMethod):757 -> a
-    583:583:void appendMethod(com.android.tools.r8.graph.DexMethod):757:757 -> a
-    584:584:java.lang.String opcodeName(int):761:761 -> a
+    138:250:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:112 -> a
+    138:250:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):397 -> a
+    251:257:void print(com.android.tools.r8.cf.code.CfInvokeDynamic):397:403 -> a
+    258:277:void print(com.android.tools.r8.cf.code.CfFrame):407:426 -> a
+    278:283:void print(com.android.tools.r8.cf.code.CfFrame$FrameType):430:435 -> a
+    284:286:void print(com.android.tools.r8.cf.code.CfInstanceOf):440:442 -> a
+    287:289:void print(com.android.tools.r8.cf.code.CfCheckCast):446:448 -> a
+    290:305:void print(com.android.tools.r8.cf.code.CfFieldInstruction):452:467 -> a
+    306:306:void print(com.android.tools.r8.cf.code.CfFieldInstruction):458:458 -> a
+    307:316:void print(com.android.tools.r8.cf.code.CfFieldInstruction):455:464 -> a
+    317:325:void print(com.android.tools.r8.cf.code.CfFieldInstruction):461:469 -> a
+    326:331:void com.android.tools.r8.cf.CfPrinter.appendField(com.android.tools.r8.graph.DexField):741:746 -> a
+    326:331:void print(com.android.tools.r8.cf.code.CfFieldInstruction):469 -> a
+    332:333:void print(com.android.tools.r8.cf.code.CfFieldInstruction):470:471 -> a
+    334:338:void com.android.tools.r8.cf.CfPrinter.appendDescriptor(com.android.tools.r8.graph.DexType):712:716 -> a
+    334:338:void print(com.android.tools.r8.cf.code.CfFieldInstruction):471 -> a
+    339:341:void print(com.android.tools.r8.cf.code.CfNew):475:477 -> a
+    342:355:void print(com.android.tools.r8.cf.code.CfNewArray):481:494 -> a
+    356:359:void print(com.android.tools.r8.cf.code.CfMultiANewArray):500:503 -> a
+    360:364:void print(com.android.tools.r8.cf.code.CfPosition):526:530 -> a
+    365:366:void print(com.android.tools.r8.cf.code.CfGoto):535:536 -> a
+    367:371:void print(com.android.tools.r8.cf.code.CfIf):544:548 -> a
+    372:372:java.lang.String com.android.tools.r8.cf.CfPrinter.ifPostfix(com.android.tools.r8.ir.code.If$Type):540:540 -> a
+    372:372:void print(com.android.tools.r8.cf.code.CfIf):548 -> a
+    373:375:void print(com.android.tools.r8.cf.code.CfIf):548:550 -> a
+    376:379:void print(com.android.tools.r8.cf.code.CfIfCmp):554:557 -> a
+    380:380:java.lang.String com.android.tools.r8.cf.CfPrinter.ifPostfix(com.android.tools.r8.ir.code.If$Type):540:540 -> a
+    380:380:void print(com.android.tools.r8.cf.code.CfIfCmp):557 -> a
+    381:383:void print(com.android.tools.r8.cf.code.CfIfCmp):557:559 -> a
+    384:401:void print(com.android.tools.r8.cf.code.CfSwitch):563:580 -> a
+    402:402:void print(com.android.tools.r8.cf.code.CfLoad):584:584 -> a
+    403:404:void com.android.tools.r8.cf.CfPrinter.printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):601:602 -> a
+    403:404:void print(com.android.tools.r8.cf.code.CfLoad):584 -> a
+    405:405:void print(com.android.tools.r8.cf.code.CfStore):588:588 -> a
+    406:407:void com.android.tools.r8.cf.CfPrinter.printPrefixed(com.android.tools.r8.ir.code.ValueType,java.lang.String,int):601:602 -> a
+    406:407:void print(com.android.tools.r8.cf.code.CfStore):588 -> a
+    408:413:void print(com.android.tools.r8.cf.code.CfIinc):592:597 -> a
+    414:426:char typePrefix(com.android.tools.r8.ir.code.ValueType):606:618 -> a
+    427:445:char typePrefix(com.android.tools.r8.ir.code.MemberType):623:641 -> a
+    446:448:void print(com.android.tools.r8.cf.code.CfConstMethodHandle):664:666 -> a
+    449:451:void print(com.android.tools.r8.cf.code.CfConstMethodType):670:672 -> a
+    452:453:void print(com.android.tools.r8.cf.code.CfJsrRet):676:677 -> a
+    454:454:java.lang.String getLabel(com.android.tools.r8.cf.code.CfLabel):681:681 -> a
+    455:457:void indent():697:699 -> a
+    458:458:void appendComment(java.lang.String):708:708 -> a
+    459:467:void appendClass(com.android.tools.r8.graph.DexType):728:736 -> a
+    468:468:void appendClass(com.android.tools.r8.graph.DexType):735:735 -> a
+    469:469:void appendClass(com.android.tools.r8.graph.DexType):734:734 -> a
+    470:477:void appendMethod(com.android.tools.r8.graph.DexMethod):750:757 -> a
+    478:590:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():0:112 -> a
+    478:590:void appendMethod(com.android.tools.r8.graph.DexMethod):757 -> a
+    591:591:void appendMethod(com.android.tools.r8.graph.DexMethod):757:757 -> a
+    592:592:java.lang.String opcodeName(int):761:761 -> a
     1:13:int lambda$getSortedLocalVariables$2(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):232:244 -> b
     14:15:void print(java.lang.String):250:251 -> b
     16:26:void print(com.android.tools.r8.cf.code.CfLabel):511:521 -> b
@@ -2429,7 +2430,7 @@
     35:35:void appendType(com.android.tools.r8.graph.DexType):721:721 -> b
     1:2:void newline():685:686 -> c
     1:1:java.lang.String toString():766:766 -> toString
-com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.k4:
+com.android.tools.r8.cf.CfRegisterAllocator -> com.android.tools.r8.internal.l4:
     int maxArgumentRegisterNumber -> n
     int nextUnusedRegisterNumber -> l
     int maxRegisterNumber -> m
@@ -2533,12 +2534,12 @@
     87:96:com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry lambda$getTypesAtBlockEntry$0(com.android.tools.r8.ir.code.BasicBlock):368:377 -> b
     97:108:void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):383:394 -> b
     1:1:int registersUsed():123:123 -> c
-com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.j4:
+com.android.tools.r8.cf.CfRegisterAllocator$TypesAtBlockEntry -> com.android.tools.r8.internal.k4:
     java.util.List stack -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap registers -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,java.util.List):71:73 -> <init>
     1:11:java.lang.String toString():78:88 -> toString
-com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.G4:
+com.android.tools.r8.cf.CfVersion -> com.android.tools.r8.internal.H4:
     com.android.tools.r8.cf.CfVersion V1_2 -> b
     com.android.tools.r8.cf.CfVersion V1_4 -> c
     boolean $assertionsDisabled -> j
@@ -2570,7 +2571,7 @@
     1:1:com.android.tools.r8.cf.CfVersion max(com.android.tools.r8.cf.CfVersion):58:58 -> g
     1:1:int hashCode():101:101 -> hashCode
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.Ra:
+com.android.tools.r8.cf.FixedLocalValue -> com.android.tools.r8.internal.ab:
     com.android.tools.r8.ir.code.Phi phi -> q
     1:2:void <init>(com.android.tools.r8.ir.code.Phi):21:22 -> <init>
     boolean isConstant() -> L
@@ -2580,7 +2581,7 @@
     2:2:int getRegister(com.android.tools.r8.cf.CfRegisterAllocator):26 -> a
     1:1:com.android.tools.r8.ir.code.Phi getPhi():30:30 -> h0
     1:1:java.lang.String toString():45:45 -> toString
-com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.Sm:
+com.android.tools.r8.cf.LoadStoreHelper -> com.android.tools.r8.internal.fn:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.code.IRCode code -> c
     boolean $assertionsDisabled -> a
@@ -2721,11 +2722,11 @@
     89:91:void com.android.tools.r8.cf.LoadStoreHelper.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.InstructionListIterator):292:294 -> b
     89:91:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):206 -> b
     92:94:void storeOutValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):207:209 -> b
-com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.cf.LoadStoreHelper$PhiMove -> com.android.tools.r8.internal.en:
     com.android.tools.r8.ir.code.Phi phi -> a
     com.android.tools.r8.ir.code.Value operand -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):236:238 -> <init>
-com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.OB:
+com.android.tools.r8.cf.TypeVerificationHelper -> com.android.tools.r8.internal.iC:
     boolean computingVerificationTypes -> j
     com.android.tools.r8.ir.code.IRCode code -> g
     com.android.tools.r8.graph.AppView appView -> f
@@ -2768,8 +2769,8 @@
     22:22:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):167:167 -> b
     23:23:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):165:165 -> b
     24:24:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo(com.android.tools.r8.ir.code.Value):163:163 -> b
-com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.JB:
-com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.KB:
+com.android.tools.r8.cf.TypeVerificationHelper$1 -> com.android.tools.r8.internal.dC:
+com.android.tools.r8.cf.TypeVerificationHelper$InitializedTypeInfo -> com.android.tools.r8.internal.eC:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():41:41 -> <clinit>
@@ -2777,7 +2778,7 @@
     2:4:void <init>(com.android.tools.r8.graph.DexType):44:46 -> <init>
     1:1:com.android.tools.r8.graph.DexType getDexType():51:51 -> a
     1:1:java.lang.String toString():56:56 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.LB:
+com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo -> com.android.tools.r8.internal.fC:
     com.android.tools.r8.ir.code.NewInstance newInstance -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():60:60 -> <clinit>
@@ -2787,7 +2788,7 @@
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> toString
     2:2:java.lang.String toString():75 -> toString
     3:3:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.MB:
+com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo -> com.android.tools.r8.internal.gC:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.Argument thisArgument -> c
@@ -2798,7 +2799,7 @@
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$ThisInstanceInfo.getDexType():92:92 -> toString
     2:2:java.lang.String toString():97 -> toString
     3:3:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.NB:
+com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo -> com.android.tools.r8.internal.hC:
     com.android.tools.r8.graph.DexType getDexType() -> a
 com.android.tools.r8.cf.code.CfArithmeticBinop -> com.android.tools.r8.internal.f3:
     com.android.tools.r8.ir.code.NumericType type -> d
@@ -2822,17 +2823,17 @@
     121:121:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
     121:121:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):208 -> a
     122:122:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):209:209 -> a
-    1:1:boolean canThrow():163:163 -> k
-    1:1:int getCompareToId():50:50 -> m
-    1:13:int getAsmOpcode():114:126 -> s
-    14:14:int getAsmOpcode():124:124 -> s
-    15:15:int getAsmOpcode():122:122 -> s
-    16:16:int getAsmOpcode():120:120 -> s
-    17:17:int getAsmOpcode():118:118 -> s
-    18:18:int getAsmOpcode():116:116 -> s
-    1:1:int getAsmOpcodeTypeOffset():131:131 -> t
-    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():59:59 -> u
-    1:1:com.android.tools.r8.ir.code.NumericType getType():63:63 -> v
+    1:1:boolean canThrow():163:163 -> l
+    1:1:int getCompareToId():50:50 -> n
+    1:13:int getAsmOpcode():114:126 -> t
+    14:14:int getAsmOpcode():124:124 -> t
+    15:15:int getAsmOpcode():122:122 -> t
+    16:16:int getAsmOpcode():120:120 -> t
+    17:17:int getAsmOpcode():118:118 -> t
+    18:18:int getAsmOpcode():116:116 -> t
+    1:1:int getAsmOpcodeTypeOffset():131:131 -> u
+    1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getOpcode():59:59 -> v
+    1:1:com.android.tools.r8.ir.code.NumericType getType():63:63 -> w
 com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode -> com.android.tools.r8.internal.f3$a:
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode[] $VALUES -> f
     com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode Sub -> b
@@ -2855,7 +2856,7 @@
     86:89:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):62:65 -> a
     90:90:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):64:64 -> a
     91:91:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):83:83 -> a
-    int getCompareToId() -> m
+    int getCompareToId() -> n
 com.android.tools.r8.cf.code.CfArrayLoad -> com.android.tools.r8.internal.h3:
     com.android.tools.r8.ir.code.MemberType type -> b
     boolean $assertionsDisabled -> a
@@ -2881,10 +2882,10 @@
     110:118:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):104 -> a
     119:125:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):105:111 -> a
     126:127:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):129:130 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():40:40 -> m
-    1:19:int getLoadType():53:71 -> s
-    1:1:com.android.tools.r8.ir.code.MemberType getType():49:49 -> t
+    boolean canThrow() -> l
+    1:1:int getCompareToId():40:40 -> n
+    1:19:int getLoadType():53:71 -> t
+    1:1:com.android.tools.r8.ir.code.MemberType getType():49:49 -> u
 com.android.tools.r8.cf.code.CfArrayStore -> com.android.tools.r8.internal.i3:
     com.android.tools.r8.ir.code.MemberType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.MemberType):32:33 -> <init>
@@ -2895,23 +2896,23 @@
     89:89:void print(com.android.tools.r8.cf.CfPrinter):88:88 -> a
     90:93:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):98:101 -> a
     94:96:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):119:121 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():42:42 -> m
-    1:19:int getStoreType():51:69 -> s
-    1:1:com.android.tools.r8.ir.code.MemberType getType():37:37 -> t
+    boolean canThrow() -> l
+    1:1:int getCompareToId():42:42 -> n
+    1:19:int getStoreType():51:69 -> t
+    1:1:com.android.tools.r8.ir.code.MemberType getType():37:37 -> u
 com.android.tools.r8.cf.code.CfCheckCast -> com.android.tools.r8.internal.m3:
     com.android.tools.r8.graph.DexType type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):31:32 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
-    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59:60 -> a
-    4:4:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-    5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):70:70 -> a
-    6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:83 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):89:89 -> a
-    10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):101:101 -> a
-    boolean canThrow() -> k
-    int getCompareToId() -> m
-    1:1:com.android.tools.r8.graph.DexType getType():36:36 -> s
+    1:2:void <init>(com.android.tools.r8.graph.DexType):32:33 -> <init>
+    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
+    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60:61 -> a
+    4:4:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> a
+    5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):72:72 -> a
+    6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):83:85 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):91:91 -> a
+    10:10:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):103:103 -> a
+    boolean canThrow() -> l
+    int getCompareToId() -> n
+    1:1:com.android.tools.r8.graph.DexType getType():37:37 -> t
 com.android.tools.r8.cf.code.CfCmp -> com.android.tools.r8.internal.n3:
     com.android.tools.r8.ir.code.Cmp$Bias bias -> c
     com.android.tools.r8.ir.code.NumericType type -> d
@@ -2929,59 +2930,59 @@
     98:98:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
     98:98:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):133 -> a
     99:99:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):134:134 -> a
-    1:1:int getCompareToId():47:47 -> m
-    1:9:int getAsmOpcode():81:89 -> s
-    10:10:int getAsmOpcode():87:87 -> s
-    11:11:int getAsmOpcode():85:85 -> s
-    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():56:56 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getType():60:60 -> u
+    1:1:int getCompareToId():47:47 -> n
+    1:9:int getAsmOpcode():81:89 -> t
+    10:10:int getAsmOpcode():87:87 -> t
+    11:11:int getAsmOpcode():85:85 -> t
+    1:1:com.android.tools.r8.ir.code.Cmp$Bias getBias():56:56 -> u
+    1:1:com.android.tools.r8.ir.code.NumericType getType():60:60 -> v
 com.android.tools.r8.cf.code.CfConstClass -> com.android.tools.r8.internal.s3:
     com.android.tools.r8.graph.DexType type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):31:32 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):42:42 -> a
-    2:2:void print(com.android.tools.r8.cf.CfPrinter):64:64 -> a
-    3:25:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):73:95 -> a
-    3:25:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59 -> a
-    26:26:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):77:77 -> a
-    26:26:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59 -> a
-    27:27:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59:59 -> a
-    28:28:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):101:101 -> a
-    29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):106:106 -> a
-    30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):112:112 -> a
-    31:31:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):124:124 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():37:37 -> m
-    1:1:com.android.tools.r8.graph.DexType getType():46:46 -> s
+    1:2:void <init>(com.android.tools.r8.graph.DexType):32:33 -> <init>
+    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):43:43 -> a
+    2:2:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
+    3:25:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):74:96 -> a
+    3:25:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60 -> a
+    26:26:java.lang.String com.android.tools.r8.cf.code.CfConstClass.getInternalName(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):78:78 -> a
+    26:26:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60 -> a
+    27:27:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60:60 -> a
+    28:28:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):103:103 -> a
+    29:29:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):108:108 -> a
+    30:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):114:114 -> a
+    31:31:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):126:126 -> a
+    boolean canThrow() -> l
+    1:1:int getCompareToId():38:38 -> n
+    1:1:com.android.tools.r8.graph.DexType getType():47:47 -> t
 com.android.tools.r8.cf.code.CfConstMethodHandle -> com.android.tools.r8.internal.t3:
     com.android.tools.r8.graph.DexMethodHandle handle -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):31:32 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethodHandle):32:33 -> <init>
     1:332:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodHandle():0:331 -> a
-    1:332:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):90 -> a
-    333:333:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
-    334:337:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59:62 -> a
-    338:338:void print(com.android.tools.r8.cf.CfPrinter):67:67 -> a
-    339:339:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):72:72 -> a
-    340:342:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):83:83 -> a
-    343:343:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):102:102 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():41:41 -> m
-    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():36:36 -> s
+    1:332:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):92 -> a
+    333:333:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
+    334:337:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60:63 -> a
+    338:338:void print(com.android.tools.r8.cf.CfPrinter):68:68 -> a
+    339:339:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):74:74 -> a
+    340:342:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):85:85 -> a
+    343:343:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):104:104 -> a
+    boolean canThrow() -> l
+    1:1:int getCompareToId():42:42 -> n
+    1:1:com.android.tools.r8.graph.DexMethodHandle getHandle():37:37 -> t
 com.android.tools.r8.cf.code.CfConstMethodType -> com.android.tools.r8.internal.u3:
     com.android.tools.r8.graph.DexProto type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexProto):31:32 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexProto):32:33 -> <init>
     1:336:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstMethodType():0:335 -> a
-    1:336:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):88 -> a
-    337:337:com.android.tools.r8.graph.DexProto com.android.tools.r8.cf.code.CfConstMethodType.getType():36:36 -> a
-    337:337:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59 -> a
-    338:339:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59:60 -> a
-    340:340:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
-    341:341:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-    342:342:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):70:70 -> a
-    343:345:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):81:81 -> a
-    346:346:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):100:100 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():41:41 -> m
-    1:1:com.android.tools.r8.graph.DexProto getType():36:36 -> s
+    1:336:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):90 -> a
+    337:337:com.android.tools.r8.graph.DexProto com.android.tools.r8.cf.code.CfConstMethodType.getType():37:37 -> a
+    337:337:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60 -> a
+    338:339:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60:61 -> a
+    340:340:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
+    341:341:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> a
+    342:342:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):72:72 -> a
+    343:345:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):83:83 -> a
+    346:346:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):102:102 -> a
+    boolean canThrow() -> l
+    1:1:int getCompareToId():42:42 -> n
+    1:1:com.android.tools.r8.graph.DexProto getType():37:37 -> t
 com.android.tools.r8.cf.code.CfConstNull -> com.android.tools.r8.internal.v3:
     1:1:void <init>():25:25 -> <init>
     1:106:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forConstInstruction():0:105 -> a
@@ -2993,7 +2994,7 @@
     111:1340:void com.android.tools.r8.ir.conversion.IRBuilder.addNullConst(int):0:1229 -> a
     111:1340:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):57 -> a
     1341:1341:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):75:75 -> a
-    int getCompareToId() -> m
+    int getCompareToId() -> n
 com.android.tools.r8.cf.code.CfConstNumber -> com.android.tools.r8.internal.w3:
     com.android.tools.r8.ir.code.ValueType type -> d
     long value -> c
@@ -3020,13 +3021,13 @@
     207:207:void print(com.android.tools.r8.cf.CfPrinter):153:153 -> a
     208:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):158:158 -> a
     209:209:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):176:176 -> a
-    1:1:int getCompareToId():39:39 -> m
-    1:2:double getDoubleValue():73:74 -> s
-    1:2:float getFloatValue():68:69 -> t
-    1:2:int getIntValue():58:59 -> u
-    1:2:long getLongValue():63:64 -> v
-    1:1:long getRawValue():54:54 -> w
-    1:1:com.android.tools.r8.ir.code.ValueType getType():50:50 -> x
+    1:1:int getCompareToId():39:39 -> n
+    1:2:double getDoubleValue():73:74 -> t
+    1:2:float getFloatValue():68:69 -> u
+    1:2:int getIntValue():58:59 -> v
+    1:2:long getLongValue():63:64 -> w
+    1:1:long getRawValue():54:54 -> x
+    1:1:com.android.tools.r8.ir.code.ValueType getType():50:50 -> y
 com.android.tools.r8.cf.code.CfConstString -> com.android.tools.r8.internal.x3:
     com.android.tools.r8.graph.DexString string -> a
     1:2:void <init>(com.android.tools.r8.graph.DexString):28:29 -> <init>
@@ -3039,67 +3040,67 @@
     110:110:void print(com.android.tools.r8.cf.CfPrinter):75:75 -> a
     111:113:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):86:86 -> a
     114:114:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):105:105 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():34:34 -> m
-    1:1:com.android.tools.r8.graph.DexString getString():43:43 -> s
+    boolean canThrow() -> l
+    1:1:int getCompareToId():34:34 -> n
+    1:1:com.android.tools.r8.graph.DexString getString():43:43 -> t
 com.android.tools.r8.cf.code.CfDexItemBasedConstString -> com.android.tools.r8.internal.y3:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexReference item -> b
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):33:35 -> <init>
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):34:36 -> <init>
     1:94:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forDexItemBasedConstString(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod):0:93 -> a
-    1:94:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):110 -> a
-    95:95:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):45:45 -> a
-    96:96:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):76:76 -> a
-    97:97:void print(com.android.tools.r8.cf.CfPrinter):82:82 -> a
-    98:99:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):93:94 -> a
+    1:94:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):112 -> a
+    95:95:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
+    96:96:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:77 -> a
+    97:97:void print(com.android.tools.r8.cf.CfPrinter):83:83 -> a
+    98:99:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):95:96 -> a
     100:100:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    100:100:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):94 -> a
-    101:102:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):94:95 -> a
-    103:105:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):101:101 -> a
-    106:106:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):122:122 -> a
-    com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
-    boolean canThrow() -> k
-    1:1:int getCompareToId():40:40 -> m
-    1:1:com.android.tools.r8.graph.DexReference getItem():49:49 -> s
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():53:53 -> t
+    100:100:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):96 -> a
+    101:102:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):96:97 -> a
+    103:105:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):103:103 -> a
+    106:106:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):124:124 -> a
+    com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> c
+    boolean canThrow() -> l
+    1:1:int getCompareToId():41:41 -> n
+    1:1:com.android.tools.r8.graph.DexReference getItem():50:50 -> t
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():54:54 -> u
 com.android.tools.r8.cf.code.CfFieldInstruction -> com.android.tools.r8.internal.z3:
     com.android.tools.r8.graph.DexField declaringField -> d
     com.android.tools.r8.graph.DexField field -> c
     boolean $assertionsDisabled -> a
     int opcode -> b
-    1:1:void <clinit>():30:30 -> <clinit>
-    1:5:void <init>(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):36:40 -> <init>
-    1:3:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):58:60 -> a
-    4:4:com.android.tools.r8.graph.DexField lambda$internalCompareTo$0(com.android.tools.r8.cf.code.CfFieldInstruction):59:59 -> a
-    5:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):83:88 -> a
-    11:11:void print(com.android.tools.r8.cf.CfPrinter):93:93 -> a
-    12:26:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):98:112 -> a
-    27:27:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):103:103 -> a
-    28:37:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):100:109 -> a
-    38:38:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):106:106 -> a
-    39:66:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):123:150 -> a
-    67:69:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):144:146 -> a
-    70:71:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):138:139 -> a
-    72:73:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):132:133 -> a
-    74:74:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):127:127 -> a
-    75:85:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):157:167 -> a
-    86:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):165:165 -> a
-    87:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):163:163 -> a
-    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):161:161 -> a
-    89:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):159:159 -> a
-    90:112:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):178:200 -> a
-    113:113:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):192:192 -> a
-    114:129:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):182:197 -> a
+    1:1:void <clinit>():31:31 -> <clinit>
+    1:5:void <init>(int,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):37:41 -> <init>
+    1:3:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):59:61 -> a
+    4:4:com.android.tools.r8.graph.DexField lambda$internalCompareTo$0(com.android.tools.r8.cf.code.CfFieldInstruction):60:60 -> a
+    5:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):84:89 -> a
+    11:11:void print(com.android.tools.r8.cf.CfPrinter):94:94 -> a
+    12:26:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):100:114 -> a
+    27:27:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):105:105 -> a
+    28:37:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):102:111 -> a
+    38:38:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):108:108 -> a
+    39:66:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):125:152 -> a
+    67:69:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):146:148 -> a
+    70:71:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):140:141 -> a
+    72:73:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):134:135 -> a
+    74:74:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):129:129 -> a
+    75:85:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):159:169 -> a
+    86:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):167:167 -> a
+    87:87:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):165:165 -> a
+    88:88:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):163:163 -> a
+    89:89:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):161:161 -> a
+    90:112:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):180:202 -> a
+    113:113:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):194:194 -> a
+    114:129:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):184:199 -> a
     130:131:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType):92:93 -> a
-    130:131:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):197 -> a
-    132:132:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):187:187 -> a
-    com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> c
-    boolean canThrow() -> k
-    1:1:int getCompareToId():53:53 -> m
-    1:1:com.android.tools.r8.graph.DexField getField():44:44 -> s
-    1:1:int getOpcode():48:48 -> t
+    130:131:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):199 -> a
+    132:132:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):189:189 -> a
+    com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> d
+    boolean canThrow() -> l
+    1:1:int getCompareToId():54:54 -> n
+    1:1:com.android.tools.r8.graph.DexField getField():45:45 -> t
+    1:1:int getOpcode():49:49 -> u
 com.android.tools.r8.cf.code.CfFrame -> com.android.tools.r8.internal.B3:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap locals -> b
     java.util.Deque stack -> c
@@ -3138,11 +3139,11 @@
     52:52:boolean com.android.tools.r8.cf.code.CfFrame$FrameType.isUninitializedNew():0:0 -> a
     52:52:com.android.tools.r8.cf.code.CfFrame$FrameType getInitializedFrameType(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):481 -> a
     53:54:com.android.tools.r8.cf.code.CfFrame$FrameType getInitializedFrameType(com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.cf.code.CfFrame$FrameType,com.android.tools.r8.graph.DexType):482:483 -> a
-    com.android.tools.r8.cf.code.CfFrame asFrame() -> d
-    1:1:int getCompareToId():151:151 -> m
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():344:344 -> s
-    1:1:java.util.Deque getStack():348:348 -> t
+    com.android.tools.r8.cf.code.CfFrame asFrame() -> e
+    1:1:int getCompareToId():151:151 -> n
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap getLocals():344:344 -> t
     1:1:java.lang.String toString():422:422 -> toString
+    1:1:java.util.Deque getStack():348:348 -> u
 com.android.tools.r8.cf.code.CfFrame$1 -> com.android.tools.r8.internal.A3:
 com.android.tools.r8.cf.code.CfFrame$FrameType -> com.android.tools.r8.internal.B3$a:
     1:1:void <init>(com.android.tools.r8.cf.code.CfFrame$1):37:37 -> <init>
@@ -3335,8 +3336,8 @@
     267:267:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
     268:268:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):82:82 -> a
     269:270:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):98:99 -> a
-    int getCompareToId() -> m
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():59:59 -> n
+    int getCompareToId() -> n
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():59:59 -> o
 com.android.tools.r8.cf.code.CfIf -> com.android.tools.r8.internal.K3:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
@@ -3354,14 +3355,14 @@
     276:277:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType):92:93 -> a
     276:277:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):136 -> a
     278:278:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):138:138 -> a
-    1:1:int getCompareToId():42:42 -> m
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():63:63 -> n
-    boolean isJump() -> q
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():58:58 -> s
-    1:15:int getOpcode():67:81 -> t
-    16:16:int getOpcode():79:79 -> t
-    17:17:int getOpcode():69:69 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():54:54 -> u
+    1:1:int getCompareToId():42:42 -> n
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():63:63 -> o
+    boolean isJump() -> r
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():58:58 -> t
+    1:15:int getOpcode():67:81 -> u
+    16:16:int getOpcode():79:79 -> u
+    17:17:int getOpcode():69:69 -> u
+    1:1:com.android.tools.r8.ir.code.ValueType getType():54:54 -> v
 com.android.tools.r8.cf.code.CfIfCmp -> com.android.tools.r8.internal.L3:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.code.If$Type kind -> b
@@ -3380,15 +3381,15 @@
     1708:1708:void com.android.tools.r8.ir.conversion.IRBuilder.addIf(com.android.tools.r8.ir.code.If$Type,com.android.tools.r8.ir.code.ValueType,int,int,int,int):1429:1429 -> a
     1708:1708:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):119 -> a
     1709:1711:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):138:140 -> a
-    1:1:int getCompareToId():42:42 -> m
-    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():63:63 -> n
-    boolean isConditionalJump() -> o
-    boolean isJump() -> q
-    1:1:com.android.tools.r8.ir.code.If$Type getKind():54:54 -> s
-    1:15:int getOpcode():67:81 -> t
-    16:16:int getOpcode():79:79 -> t
-    17:17:int getOpcode():69:69 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():58:58 -> u
+    1:1:int getCompareToId():42:42 -> n
+    1:1:com.android.tools.r8.cf.code.CfLabel getTarget():63:63 -> o
+    boolean isConditionalJump() -> p
+    boolean isJump() -> r
+    1:1:com.android.tools.r8.ir.code.If$Type getKind():54:54 -> t
+    1:15:int getOpcode():67:81 -> u
+    16:16:int getOpcode():79:79 -> u
+    17:17:int getOpcode():69:69 -> u
+    1:1:com.android.tools.r8.ir.code.ValueType getType():58:58 -> v
 com.android.tools.r8.cf.code.CfIinc -> com.android.tools.r8.internal.M3:
     int increment -> b
     int var -> a
@@ -3399,159 +3400,160 @@
     6:7:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):76:77 -> a
     8:8:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):83:83 -> a
     9:9:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):93:93 -> a
-    int getCompareToId() -> m
-    1:1:int getIncrement():71:71 -> s
-    1:1:int getLocalIndex():67:67 -> t
+    int getCompareToId() -> n
+    1:1:int getIncrement():71:71 -> t
+    1:1:int getLocalIndex():67:67 -> u
 com.android.tools.r8.cf.code.CfInitClass -> com.android.tools.r8.internal.N3:
     com.android.tools.r8.graph.DexType clazz -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):32:33 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):51:51 -> a
-    2:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:71 -> a
-    8:8:void print(com.android.tools.r8.cf.CfPrinter):76:76 -> a
-    9:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):81:81 -> a
-    10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):91:92 -> a
-    12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):98:98 -> a
-    13:13:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):110:110 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():46:46 -> m
-    1:1:com.android.tools.r8.graph.DexType getClassValue():37:37 -> s
+    1:2:void <init>(com.android.tools.r8.graph.DexType):33:34 -> <init>
+    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):52:52 -> a
+    2:7:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):67:72 -> a
+    8:8:void print(com.android.tools.r8.cf.CfPrinter):77:77 -> a
+    9:9:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):83:83 -> a
+    10:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93:94 -> a
+    12:12:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):100:100 -> a
+    13:13:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):112:112 -> a
+    boolean canThrow() -> l
+    1:1:int getCompareToId():47:47 -> n
+    1:1:com.android.tools.r8.graph.DexType getClassValue():38:38 -> t
 com.android.tools.r8.cf.code.CfInstanceOf -> com.android.tools.r8.internal.O3:
     com.android.tools.r8.graph.DexType type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):30:31 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):45:45 -> a
-    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:69 -> a
-    4:4:void print(com.android.tools.r8.cf.CfPrinter):74:74 -> a
-    5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):79:79 -> a
-    6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:91 -> a
-    9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):90:90 -> a
-    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):97:97 -> a
-    11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):109:109 -> a
-    com.android.tools.r8.cf.code.CfInstanceOf asInstanceOf() -> e
-    boolean canThrow() -> k
-    int getCompareToId() -> m
-    1:1:com.android.tools.r8.graph.DexType getType():35:35 -> s
+    1:2:void <init>(com.android.tools.r8.graph.DexType):31:32 -> <init>
+    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
+    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69:70 -> a
+    4:4:void print(com.android.tools.r8.cf.CfPrinter):75:75 -> a
+    5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):81:81 -> a
+    6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):91:93 -> a
+    9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):92:92 -> a
+    10:10:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):99:99 -> a
+    11:11:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):111:111 -> a
+    com.android.tools.r8.cf.code.CfInstanceOf asInstanceOf() -> f
+    boolean canThrow() -> l
+    int getCompareToId() -> n
+    1:1:com.android.tools.r8.graph.DexType getType():36:36 -> t
 com.android.tools.r8.cf.code.CfInstruction -> com.android.tools.r8.internal.P3:
-    1:1:void <init>():26:26 -> <init>
+    1:1:void <init>():28:28 -> <init>
     com.android.tools.r8.cf.code.CfConstString asConstString() -> a
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode) -> a
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
     com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod) -> a
     int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper) -> a
-    void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod) -> a
+    void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator) -> a
     void print(com.android.tools.r8.cf.CfPrinter) -> a
     void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor) -> a
-    1:1:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod):76:76 -> a
-    2:2:void registerUseForDesugaring(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ClasspathMethod):80:80 -> a
-    com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> b
-    com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> c
-    com.android.tools.r8.cf.code.CfFrame asFrame() -> d
-    com.android.tools.r8.cf.code.CfInstanceOf asInstanceOf() -> e
-    com.android.tools.r8.cf.code.CfInvoke asInvoke() -> f
-    com.android.tools.r8.cf.code.CfLabel asLabel() -> g
-    com.android.tools.r8.cf.code.CfLoad asLoad() -> h
-    com.android.tools.r8.cf.code.CfPosition asPosition() -> i
-    com.android.tools.r8.cf.code.CfStore asStore() -> j
-    boolean canThrow() -> k
-    boolean emitsIR() -> l
-    int getCompareToId() -> m
-    com.android.tools.r8.cf.code.CfLabel getTarget() -> n
-    boolean isConditionalJump() -> o
-    boolean isFrame() -> p
-    boolean isJump() -> q
-    boolean isReturn() -> r
-    1:3:java.lang.String toString():70:72 -> toString
+    1:1:void registerUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):79:79 -> a
+    2:2:void registerUseForDesugaring(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ClasspathMethod,java.util.ListIterator):84:84 -> a
+    com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
+    com.android.tools.r8.cf.code.CfDexItemBasedConstString asDexItemBasedConstString() -> c
+    com.android.tools.r8.cf.code.CfFieldInstruction asFieldInstruction() -> d
+    com.android.tools.r8.cf.code.CfFrame asFrame() -> e
+    com.android.tools.r8.cf.code.CfInstanceOf asInstanceOf() -> f
+    com.android.tools.r8.cf.code.CfInvoke asInvoke() -> g
+    com.android.tools.r8.cf.code.CfLabel asLabel() -> h
+    com.android.tools.r8.cf.code.CfLoad asLoad() -> i
+    com.android.tools.r8.cf.code.CfPosition asPosition() -> j
+    com.android.tools.r8.cf.code.CfStore asStore() -> k
+    boolean canThrow() -> l
+    boolean emitsIR() -> m
+    int getCompareToId() -> n
+    com.android.tools.r8.cf.code.CfLabel getTarget() -> o
+    boolean isConditionalJump() -> p
+    boolean isFrame() -> q
+    boolean isJump() -> r
+    boolean isReturn() -> s
+    1:3:java.lang.String toString():72:74 -> toString
 com.android.tools.r8.cf.code.CfInvoke -> com.android.tools.r8.internal.Q3:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexMethod method -> b
     int opcode -> c
     boolean itf -> d
-    1:1:void <clinit>():40:40 -> <clinit>
-    1:7:void <init>(int,com.android.tools.r8.graph.DexMethod,boolean):46:52 -> <init>
-    1:3:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):62:64 -> a
-    4:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):99:105 -> a
-    11:11:void print(com.android.tools.r8.cf.CfPrinter):110:110 -> a
-    12:30:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):115:133 -> a
-    31:31:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):130:130 -> a
-    32:32:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):127:127 -> a
-    33:33:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):124:124 -> a
-    34:34:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):121:121 -> a
-    35:35:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):118:118 -> a
-    36:54:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):138:156 -> a
-    55:68:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):140:153 -> a
-    69:73:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):146:150 -> a
-    74:74:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):148:148 -> a
-    75:75:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):143:143 -> a
-    76:78:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):161:163 -> a
-    79:129:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):180:230 -> a
-    130:173:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):183:226 -> a
-    174:178:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):213:217 -> a
-    179:188:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):354:363 -> a
-    179:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):217 -> a
-    189:191:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.cf.code.CfInvoke.lookupMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):390:392 -> a
-    189:191:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):364 -> a
-    189:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):217 -> a
-    192:208:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):368:384 -> a
-    192:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):217 -> a
+    1:1:void <clinit>():41:41 -> <clinit>
+    1:7:void <init>(int,com.android.tools.r8.graph.DexMethod,boolean):47:53 -> <init>
+    1:3:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):63:65 -> a
+    4:10:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):100:106 -> a
+    11:11:void print(com.android.tools.r8.cf.CfPrinter):111:111 -> a
+    12:30:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):117:135 -> a
+    31:31:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):132:132 -> a
+    32:32:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):129:129 -> a
+    33:33:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):126:126 -> a
+    34:34:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):123:123 -> a
+    35:35:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):120:120 -> a
+    36:54:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):140:158 -> a
+    55:68:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):142:155 -> a
+    69:73:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):148:152 -> a
+    74:74:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):150:150 -> a
+    75:75:com.android.tools.r8.ir.code.Invoke$Type getInvokeType(com.android.tools.r8.graph.DexClassAndMethod):145:145 -> a
+    76:78:boolean isInvokeSuper(com.android.tools.r8.graph.DexType):163:165 -> a
+    79:129:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):182:232 -> a
+    130:173:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):185:228 -> a
+    174:178:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):215:219 -> a
+    179:188:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):356:365 -> a
+    179:188:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):219 -> a
+    189:191:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.cf.code.CfInvoke.lookupMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexMethod):392:394 -> a
+    189:191:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):366 -> a
+    189:191:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):219 -> a
+    192:208:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):370:386 -> a
+    192:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):219 -> a
     209:209:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    209:209:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):384 -> a
-    209:209:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):217 -> a
-    210:210:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):384:384 -> a
-    210:210:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):217 -> a
-    211:211:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):219:219 -> a
-    212:267:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):189:244 -> a
-    268:271:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):243:246 -> a
-    272:336:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):253:317 -> a
-    337:368:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):262:293 -> a
-    369:405:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):267:303 -> a
-    406:406:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    406:406:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):303 -> a
-    407:423:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):304:320 -> a
-    424:425:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):335:336 -> a
-    426:426:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    426:426:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):336 -> a
-    427:429:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):337:339 -> a
+    209:209:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):386 -> a
+    209:209:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):219 -> a
+    210:210:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.cf.code.CfInvoke.invokeTypeForInvokeSpecialToNonInitMethodOnHolder(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CfSourceCode):386:386 -> a
+    210:210:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):219 -> a
+    211:211:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):221:221 -> a
+    212:267:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):191:246 -> a
+    268:271:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):245:248 -> a
+    272:336:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):255:319 -> a
+    337:368:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):264:295 -> a
+    369:405:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):269:305 -> a
+    406:406:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    406:406:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):305 -> a
+    407:423:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):306:322 -> a
+    424:425:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):337:338 -> a
+    426:426:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
+    426:426:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):338 -> a
+    427:429:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):339:341 -> a
     430:431:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType):92:93 -> a
-    430:431:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):339 -> a
-    432:433:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):341:342 -> a
-    434:434:boolean noNeedToUseGraphLens(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):348:348 -> a
-    com.android.tools.r8.cf.code.CfInvoke asInvoke() -> f
-    boolean canThrow() -> k
-    1:1:int getCompareToId():57:57 -> m
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():68:68 -> s
-    1:1:int getOpcode():72:72 -> t
-    1:1:boolean isInterface():76:76 -> u
-    1:1:boolean isInvokeVirtual():167:167 -> v
+    430:431:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):341 -> a
+    432:433:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):343:344 -> a
+    434:434:boolean noNeedToUseGraphLens(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens):350:350 -> a
+    com.android.tools.r8.cf.code.CfInvoke asInvoke() -> g
+    boolean canThrow() -> l
+    1:1:int getCompareToId():58:58 -> n
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():69:69 -> t
+    1:1:int getOpcode():73:73 -> u
+    1:1:boolean isInterface():77:77 -> v
+    1:1:boolean isInvokeVirtual():169:169 -> w
 com.android.tools.r8.cf.code.CfInvokeDynamic -> com.android.tools.r8.internal.R3:
     com.android.tools.r8.graph.DexCallSite callSite -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexCallSite):40:41 -> <init>
+    1:2:void <init>(com.android.tools.r8.graph.DexCallSite):41:42 -> <init>
     1:168:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forInvokeCustom():0:167 -> a
-    1:168:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):144 -> a
-    169:169:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):51:51 -> a
-    170:175:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):64:69 -> a
-    176:196:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):81:101 -> a
-    176:196:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
-    197:197:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):98:98 -> a
-    197:197:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
-    198:199:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):95:96 -> a
-    198:199:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
-    200:202:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):91:93 -> a
-    200:202:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
-    203:209:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):83:89 -> a
-    203:209:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
-    210:210:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):87:87 -> a
-    210:210:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
-    211:217:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69:75 -> a
-    218:218:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):73:73 -> a
-    219:219:void print(com.android.tools.r8.cf.CfPrinter):107:107 -> a
-    220:220:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):116:116 -> a
-    221:223:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):126:128 -> a
+    1:168:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):146 -> a
+    169:169:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):52:52 -> a
+    170:175:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:70 -> a
+    176:196:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):82:102 -> a
+    176:196:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70 -> a
+    197:197:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):99:99 -> a
+    197:197:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70 -> a
+    198:199:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):96:97 -> a
+    198:199:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70 -> a
+    200:202:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):92:94 -> a
+    200:202:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70 -> a
+    203:209:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):84:90 -> a
+    203:209:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70 -> a
+    210:210:java.lang.Object com.android.tools.r8.cf.code.CfInvokeDynamic.decodeBootstrapArgument(com.android.tools.r8.graph.DexValue,com.android.tools.r8.naming.NamingLens):88:88 -> a
+    210:210:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70 -> a
+    211:217:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70:76 -> a
+    218:218:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:74 -> a
+    219:219:void print(com.android.tools.r8.cf.CfPrinter):108:108 -> a
+    220:220:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):118:118 -> a
+    221:223:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):128:130 -> a
     224:419:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):0:195 -> a
-    224:419:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):128 -> a
-    420:429:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):128:137 -> a
-    430:432:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):156:158 -> a
-    boolean canThrow() -> k
-    int getCompareToId() -> m
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():111:111 -> s
+    224:419:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130 -> a
+    420:429:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:139 -> a
+    430:432:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):158:160 -> a
+    boolean canThrow() -> l
+    int getCompareToId() -> n
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():112:112 -> t
 com.android.tools.r8.cf.code.CfJsrRet -> com.android.tools.r8.internal.S3:
     int local -> a
     1:2:void <init>(int):34:35 -> <init>
@@ -3561,12 +3563,12 @@
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):68:68 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):74:74 -> a
     6:6:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):86:86 -> a
-    1:1:int getCompareToId():40:40 -> m
-    1:1:com.android.tools.r8.errors.CompilationError error():28:28 -> s
-    2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> s
-    2:2:com.android.tools.r8.errors.CompilationError error():28 -> s
-    3:3:com.android.tools.r8.errors.CompilationError error():28:28 -> s
-    1:1:int getLocal():90:90 -> t
+    1:1:int getCompareToId():40:40 -> n
+    1:1:com.android.tools.r8.errors.CompilationError error():28:28 -> t
+    2:2:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> t
+    2:2:com.android.tools.r8.errors.CompilationError error():28 -> t
+    3:3:com.android.tools.r8.errors.CompilationError error():28:28 -> t
+    1:1:int getLocal():90:90 -> u
 com.android.tools.r8.cf.code.CfLabel -> com.android.tools.r8.internal.T3:
     com.android.tools.r8.org.objectweb.asm.Label label -> a
     1:3:void <init>():24:26 -> <init>
@@ -3576,10 +3578,10 @@
     2:2:void print(com.android.tools.r8.cf.CfPrinter):57:57 -> a
     3:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70:70 -> a
     4:4:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
-    com.android.tools.r8.cf.code.CfLabel asLabel() -> g
-    boolean emitsIR() -> l
-    1:1:int getCompareToId():37:37 -> m
-    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():29:32 -> s
+    com.android.tools.r8.cf.code.CfLabel asLabel() -> h
+    boolean emitsIR() -> m
+    1:1:int getCompareToId():37:37 -> n
+    1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():29:32 -> t
 com.android.tools.r8.cf.code.CfLoad -> com.android.tools.r8.internal.Y3:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
@@ -3597,12 +3599,12 @@
     276:278:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):102:104 -> a
     279:1600:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1321 -> a
     279:1600:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):104 -> a
-    com.android.tools.r8.cf.code.CfLoad asLoad() -> h
-    boolean emitsIR() -> l
-    1:1:int getCompareToId():39:39 -> m
-    1:13:int getLoadType():48:60 -> s
-    1:1:int getLocalIndex():97:97 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():93:93 -> u
+    com.android.tools.r8.cf.code.CfLoad asLoad() -> i
+    boolean emitsIR() -> m
+    1:1:int getCompareToId():39:39 -> n
+    1:13:int getLoadType():48:60 -> t
+    1:1:int getLocalIndex():97:97 -> u
+    1:1:com.android.tools.r8.ir.code.ValueType getType():93:93 -> v
 com.android.tools.r8.cf.code.CfLogicalBinop -> com.android.tools.r8.internal.Z3:
     com.android.tools.r8.ir.code.NumericType type -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode opcode -> c
@@ -3626,16 +3628,16 @@
     125:125:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
     125:125:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):180 -> a
     126:135:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):182:191 -> a
-    1:1:int getCompareToId():52:52 -> m
-    1:15:int getAsmOpcode():100:114 -> s
-    16:16:int getAsmOpcode():112:112 -> s
-    17:17:int getAsmOpcode():110:110 -> s
-    18:18:int getAsmOpcode():108:108 -> s
-    19:19:int getAsmOpcode():106:106 -> s
-    20:20:int getAsmOpcode():104:104 -> s
-    21:21:int getAsmOpcode():102:102 -> s
-    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():65:65 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getType():61:61 -> u
+    1:1:int getCompareToId():52:52 -> n
+    1:15:int getAsmOpcode():100:114 -> t
+    16:16:int getAsmOpcode():112:112 -> t
+    17:17:int getAsmOpcode():110:110 -> t
+    18:18:int getAsmOpcode():108:108 -> t
+    19:19:int getAsmOpcode():106:106 -> t
+    20:20:int getAsmOpcode():104:104 -> t
+    21:21:int getAsmOpcode():102:102 -> t
+    1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getOpcode():65:65 -> u
+    1:1:com.android.tools.r8.ir.code.NumericType getType():61:61 -> v
 com.android.tools.r8.cf.code.CfLogicalBinop$Opcode -> com.android.tools.r8.internal.Z3$a:
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode Shl -> a
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode[] $VALUES -> g
@@ -3661,35 +3663,35 @@
     279:279:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):97:97 -> a
     280:281:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.cf.code.CfFrame$FrameType):106:107 -> a
     280:281:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):97 -> a
-    boolean canThrow() -> k
-    1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():63:63 -> m
-    1:1:int getCompareToId():41 -> m
-    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():36:36 -> s
+    boolean canThrow() -> l
+    1:1:int com.android.tools.r8.cf.code.CfMonitor.getAsmOpcode():63:63 -> n
+    1:1:int getCompareToId():41 -> n
+    1:1:com.android.tools.r8.ir.code.Monitor$Type getType():36:36 -> t
 com.android.tools.r8.cf.code.CfMultiANewArray -> com.android.tools.r8.internal.b4:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     int dimensions -> c
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType,int):33:35 -> <init>
-    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfMultiANewArray.getType():39:39 -> a
-    1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):68 -> a
-    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:69 -> a
-    4:6:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):53:55 -> a
-    7:7:void print(com.android.tools.r8.cf.CfPrinter):74:74 -> a
-    8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):79:79 -> a
-    9:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:91 -> a
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType,int):34:36 -> <init>
+    1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfMultiANewArray.getType():40:40 -> a
+    1:1:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69 -> a
+    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):69:70 -> a
+    4:6:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):54:56 -> a
+    7:7:void print(com.android.tools.r8.cf.CfPrinter):75:75 -> a
+    8:8:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):81:81 -> a
+    9:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):91:93 -> a
     12:207:int[] com.android.tools.r8.ir.conversion.CfState.popReverse(int):0:195 -> a
-    12:207:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):91 -> a
-    208:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):92:92 -> a
-    209:209:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):98:98 -> a
-    210:211:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):110:111 -> a
+    12:207:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):93 -> a
+    208:208:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):94:94 -> a
+    209:209:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):100:100 -> a
+    210:211:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):112:113 -> a
     212:213:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType):92:93 -> a
-    212:213:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):111 -> a
-    214:214:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):113:113 -> a
-    boolean canThrow() -> k
-    int getCompareToId() -> m
-    1:1:int getDimensions():43:43 -> s
-    1:1:com.android.tools.r8.graph.DexType getType():39:39 -> t
+    212:213:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):113 -> a
+    214:214:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):115:115 -> a
+    boolean canThrow() -> l
+    int getCompareToId() -> n
+    1:1:int getDimensions():44:44 -> t
+    1:1:com.android.tools.r8.graph.DexType getType():40:40 -> u
 com.android.tools.r8.cf.code.CfNeg -> com.android.tools.r8.internal.c4:
     com.android.tools.r8.ir.code.NumericType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.NumericType):32:33 -> <init>
@@ -3703,55 +3705,55 @@
     335:335:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
     335:335:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):122 -> a
     336:336:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):123:123 -> a
-    1:1:int getCompareToId():42:42 -> m
-    1:14:int getAsmOpcode():69:82 -> s
-    1:1:com.android.tools.r8.ir.code.NumericType getType():37:37 -> t
+    1:1:int getCompareToId():42:42 -> n
+    1:14:int getAsmOpcode():69:82 -> t
+    1:1:com.android.tools.r8.ir.code.NumericType getType():37:37 -> u
 com.android.tools.r8.cf.code.CfNew -> com.android.tools.r8.internal.d4:
     com.android.tools.r8.graph.DexType type -> a
-    1:2:void <init>(com.android.tools.r8.graph.DexType):31:32 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):46:46 -> a
-    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):59:60 -> a
-    4:4:void print(com.android.tools.r8.cf.CfPrinter):65:65 -> a
-    5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):70:70 -> a
-    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):80:80 -> a
-    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):86:86 -> a
-    8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):98:98 -> a
-    boolean canThrow() -> k
-    int getCompareToId() -> m
-    1:1:com.android.tools.r8.graph.DexType getType():36:36 -> s
+    1:2:void <init>(com.android.tools.r8.graph.DexType):32:33 -> <init>
+    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):47:47 -> a
+    2:3:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):60:61 -> a
+    4:4:void print(com.android.tools.r8.cf.CfPrinter):66:66 -> a
+    5:5:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):72:72 -> a
+    6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):82:82 -> a
+    7:7:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):88:88 -> a
+    8:8:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):100:100 -> a
+    boolean canThrow() -> l
+    int getCompareToId() -> n
+    1:1:com.android.tools.r8.graph.DexType getType():37:37 -> t
 com.android.tools.r8.cf.code.CfNewArray -> com.android.tools.r8.internal.e4:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():29:29 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.DexType):33:35 -> <init>
-    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):49:49 -> a
-    2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):101:101 -> a
-    3:21:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():53:71 -> a
-    3:21:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):102 -> a
-    22:22:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):102:102 -> a
-    23:24:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):77:78 -> a
-    23:24:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105 -> a
-    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfNewArray.getType():39:39 -> a
-    25:25:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):80 -> a
-    25:25:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105 -> a
-    26:28:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):80:82 -> a
-    26:28:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105 -> a
-    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfNewArray.getType():39:39 -> a
-    29:29:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):84 -> a
-    29:29:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105 -> a
-    30:33:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):84:87 -> a
-    30:33:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105 -> a
-    34:36:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):86:88 -> a
-    34:36:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105 -> a
-    37:37:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):104:104 -> a
-    38:38:void print(com.android.tools.r8.cf.CfPrinter):111:111 -> a
-    39:40:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod):116:117 -> a
-    41:43:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):128:130 -> a
-    44:44:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):136:136 -> a
-    45:46:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):148:149 -> a
-    boolean canThrow() -> k
-    1:1:int getCompareToId():44:44 -> m
-    1:1:com.android.tools.r8.graph.DexType getType():39:39 -> s
+    1:1:void <clinit>():30:30 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexType):34:36 -> <init>
+    1:1:int internalCompareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):50:50 -> a
+    2:2:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):102:102 -> a
+    3:21:int com.android.tools.r8.cf.code.CfNewArray.getPrimitiveTypeCode():54:72 -> a
+    3:21:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):103 -> a
+    22:22:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):103:103 -> a
+    23:24:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):78:79 -> a
+    23:24:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106 -> a
+    25:25:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfNewArray.getType():40:40 -> a
+    25:25:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):81 -> a
+    25:25:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106 -> a
+    26:28:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):81:83 -> a
+    26:28:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106 -> a
+    29:29:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.code.CfNewArray.getType():40:40 -> a
+    29:29:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):85 -> a
+    29:29:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106 -> a
+    30:33:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):85:88 -> a
+    30:33:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106 -> a
+    34:36:java.lang.String com.android.tools.r8.cf.code.CfNewArray.getElementInternalName(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):87:89 -> a
+    34:36:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):106 -> a
+    37:37:void write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):105:105 -> a
+    38:38:void print(com.android.tools.r8.cf.CfPrinter):112:112 -> a
+    39:40:void internalRegisterUse(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.DexClassAndMethod,java.util.ListIterator):118:119 -> a
+    41:43:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):130:132 -> a
+    44:44:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):138:138 -> a
+    45:46:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):150:151 -> a
+    boolean canThrow() -> l
+    1:1:int getCompareToId():45:45 -> n
+    1:1:com.android.tools.r8.graph.DexType getType():40:40 -> t
 com.android.tools.r8.cf.code.CfNop -> com.android.tools.r8.internal.f4:
     1:1:void <init>():24:24 -> <init>
     void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens) -> a
@@ -3760,8 +3762,8 @@
     3:3:void print(com.android.tools.r8.cf.CfPrinter):51:51 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):56:56 -> a
     5:5:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):67:67 -> a
-    boolean emitsIR() -> l
-    int getCompareToId() -> m
+    boolean emitsIR() -> m
+    int getCompareToId() -> n
 com.android.tools.r8.cf.code.CfNumberConversion -> com.android.tools.r8.internal.g4:
     com.android.tools.r8.ir.code.NumericType to -> d
     com.android.tools.r8.ir.code.NumericType from -> c
@@ -3782,14 +3784,14 @@
     337:337:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrame$FrameType.fromNumericType(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.graph.DexItemFactory):135:135 -> a
     337:337:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):195 -> a
     338:338:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):195:195 -> a
-    1:1:int getCompareToId():44:44 -> m
-    1:53:int getAsmOpcode():79:131 -> s
-    54:101:int getAsmOpcode():81:128 -> s
-    102:110:int getAsmOpcode():109:117 -> s
-    111:119:int getAsmOpcode():98:106 -> s
-    1:1:com.android.tools.r8.ir.code.NumericType getFromType():53:53 -> t
-    1:1:com.android.tools.r8.ir.code.NumericType getToType():57:57 -> u
-com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.h4:
+    1:1:int getCompareToId():44:44 -> n
+    1:53:int getAsmOpcode():79:131 -> t
+    54:101:int getAsmOpcode():81:128 -> t
+    102:110:int getAsmOpcode():109:117 -> t
+    111:119:int getAsmOpcode():98:106 -> t
+    1:1:com.android.tools.r8.ir.code.NumericType getFromType():53:53 -> u
+    1:1:com.android.tools.r8.ir.code.NumericType getToType():57:57 -> v
+com.android.tools.r8.cf.code.CfPosition -> com.android.tools.r8.internal.i4:
     com.android.tools.r8.cf.code.CfLabel label -> a
     com.android.tools.r8.ir.code.Position position -> b
     1:3:void <init>(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.Position):29:31 -> <init>
@@ -3799,12 +3801,12 @@
     5:5:void print(com.android.tools.r8.cf.CfPrinter):61:61 -> a
     6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):89:91 -> a
     9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):97:97 -> a
-    com.android.tools.r8.cf.code.CfPosition asPosition() -> i
-    boolean emitsIR() -> l
-    1:1:int getCompareToId():36:36 -> m
-    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():69:69 -> s
-    1:1:com.android.tools.r8.ir.code.Position getPosition():65:65 -> t
-com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.l4:
+    com.android.tools.r8.cf.code.CfPosition asPosition() -> j
+    boolean emitsIR() -> m
+    1:1:int getCompareToId():36:36 -> n
+    1:1:com.android.tools.r8.cf.code.CfLabel getLabel():69:69 -> t
+    1:1:com.android.tools.r8.ir.code.Position getPosition():65:65 -> u
+com.android.tools.r8.cf.code.CfReturn -> com.android.tools.r8.internal.m4:
     com.android.tools.r8.ir.code.ValueType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -3816,11 +3818,11 @@
     307:307:void print(com.android.tools.r8.cf.CfPrinter):86:86 -> a
     308:309:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):96:97 -> a
     310:312:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):113:115 -> a
-    1:1:int getCompareToId():41:41 -> m
-    boolean isJump() -> q
-    1:13:int getOpcode():50:62 -> s
-    1:1:com.android.tools.r8.ir.code.ValueType getType():36:36 -> t
-com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.m4:
+    1:1:int getCompareToId():41:41 -> n
+    boolean isJump() -> r
+    1:13:int getOpcode():50:62 -> t
+    1:1:com.android.tools.r8.ir.code.ValueType getType():36:36 -> u
+com.android.tools.r8.cf.code.CfReturnVoid -> com.android.tools.r8.internal.n4:
     1:1:void <init>():24:24 -> <init>
     1:304:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forReturn():0:303 -> a
     1:304:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):77 -> a
@@ -3829,10 +3831,10 @@
     307:307:void print(com.android.tools.r8.cf.CfPrinter):56:56 -> a
     308:308:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfSourceCode):71:71 -> a
     309:309:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):87:87 -> a
-    int getCompareToId() -> m
-    boolean isJump() -> q
-    boolean isReturn() -> r
-com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.r4:
+    int getCompareToId() -> n
+    boolean isJump() -> r
+    boolean isReturn() -> s
+com.android.tools.r8.cf.code.CfStackInstruction -> com.android.tools.r8.internal.s4:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode opcode -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():29:29 -> <clinit>
@@ -4049,10 +4051,10 @@
     1337:1337:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301:301 -> b
     1338:1338:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):1321:1321 -> b
     1338:1338:void dup2x1(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.ir.conversion.CfState,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot,com.android.tools.r8.ir.conversion.CfState$Slot):301 -> b
-    boolean emitsIR() -> l
-    1:1:int getCompareToId():86:86 -> m
-    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():113:113 -> s
-com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.r4$a:
+    boolean emitsIR() -> m
+    1:1:int getCompareToId():86:86 -> n
+    1:1:com.android.tools.r8.cf.code.CfStackInstruction$Opcode getOpcode():113:113 -> t
+com.android.tools.r8.cf.code.CfStackInstruction$Opcode -> com.android.tools.r8.internal.s4$a:
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Swap -> i
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X2 -> h
     com.android.tools.r8.cf.code.CfStackInstruction$Opcode Dup2X1 -> g
@@ -4068,7 +4070,7 @@
     10:10:void <clinit>():31:31 -> <clinit>
     1:2:void <init>(java.lang.String,int,int):44:45 -> <init>
     1:1:int access$000(com.android.tools.r8.cf.code.CfStackInstruction$Opcode):31:31 -> a
-com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.C4:
+com.android.tools.r8.cf.code.CfStore -> com.android.tools.r8.internal.D4:
     com.android.tools.r8.ir.code.ValueType type -> b
     int var -> a
     1:3:void <init>(com.android.tools.r8.ir.code.ValueType,int):33:35 -> <init>
@@ -4086,13 +4088,13 @@
     1676:1677:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):138:139 -> a
     1678:1679:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):134:135 -> a
     1680:1681:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):130:131 -> a
-    com.android.tools.r8.cf.code.CfStore asStore() -> j
-    boolean emitsIR() -> l
-    1:1:int getCompareToId():40:40 -> m
-    1:1:int getLocalIndex():98:98 -> s
-    1:13:int getStoreType():49:61 -> t
-    1:1:com.android.tools.r8.ir.code.ValueType getType():94:94 -> u
-com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.D4:
+    com.android.tools.r8.cf.code.CfStore asStore() -> k
+    boolean emitsIR() -> m
+    1:1:int getCompareToId():40:40 -> n
+    1:1:int getLocalIndex():98:98 -> t
+    1:13:int getStoreType():49:61 -> u
+    1:1:com.android.tools.r8.ir.code.ValueType getType():94:94 -> v
+com.android.tools.r8.cf.code.CfSwitch -> com.android.tools.r8.internal.E4:
     java.util.List targets -> e
     int[] keys -> d
     com.android.tools.r8.cf.code.CfSwitch$Kind kind -> b
@@ -4112,21 +4114,21 @@
     292:293:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType):92:93 -> a
     292:293:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):152 -> a
     294:296:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):153:155 -> a
-    1:1:int getCompareToId():53:53 -> m
-    boolean isJump() -> q
-    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():70:70 -> s
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():74:74 -> t
-    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> t
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():74 -> t
-    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():66:66 -> u
-    1:1:java.util.List getSwitchTargets():78:78 -> v
-com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.D4$a:
+    1:1:int getCompareToId():53:53 -> n
+    boolean isJump() -> r
+    1:1:com.android.tools.r8.cf.code.CfLabel getDefaultTarget():70:70 -> t
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():74:74 -> u
+    2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> u
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList getKeys():74 -> u
+    1:1:com.android.tools.r8.cf.code.CfSwitch$Kind getKind():66:66 -> v
+    1:1:java.util.List getSwitchTargets():78:78 -> w
+com.android.tools.r8.cf.code.CfSwitch$Kind -> com.android.tools.r8.internal.E4$a:
     com.android.tools.r8.cf.code.CfSwitch$Kind[] $VALUES -> c
     com.android.tools.r8.cf.code.CfSwitch$Kind TABLE -> b
     com.android.tools.r8.cf.code.CfSwitch$Kind LOOKUP -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
-com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.E4:
+com.android.tools.r8.cf.code.CfThrow -> com.android.tools.r8.internal.F4:
     1:1:void <init>():25:25 -> <init>
     1:264:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forJumpInstruction():0:263 -> a
     1:264:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):84 -> a
@@ -4138,10 +4140,10 @@
     271:272:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.cf.code.CfFrameVerificationHelper.pop(com.android.tools.r8.graph.DexType):92:93 -> a
     271:272:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):96 -> a
     273:273:void evaluate(com.android.tools.r8.cf.code.CfFrameVerificationHelper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.InitClassLens):98:98 -> a
-    boolean canThrow() -> k
-    int getCompareToId() -> m
-    boolean isJump() -> q
-com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.F4:
+    boolean canThrow() -> l
+    int getCompareToId() -> n
+    boolean isJump() -> r
+com.android.tools.r8.cf.code.CfTryCatch -> com.android.tools.r8.internal.G4:
     java.util.List targets -> f
     java.util.List guards -> e
     boolean $assertionsDisabled -> a
@@ -4162,9 +4164,9 @@
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddDouble2Addr -> com.android.tools.r8.code.a:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -4172,20 +4174,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddFloat -> com.android.tools.r8.code.d:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddFloat2Addr -> com.android.tools.r8.code.c:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4193,20 +4195,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddInt -> com.android.tools.r8.code.f:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddInt2Addr -> com.android.tools.r8.code.e:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4214,34 +4216,34 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddIntLit16 -> com.android.tools.r8.code.g:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddIntLit8 -> com.android.tools.r8.code.h:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddLong -> com.android.tools.r8.code.j:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AddLong2Addr -> com.android.tools.r8.code.i:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -4249,82 +4251,82 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Aget -> com.android.tools.r8.code.k:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AgetBoolean -> com.android.tools.r8.code.l:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AgetByte -> com.android.tools.r8.code.m:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AgetChar -> com.android.tools.r8.code.n:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AgetObject -> com.android.tools.r8.code.o:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AgetShort -> com.android.tools.r8.code.p:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AgetWide -> com.android.tools.r8.code.q:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AndInt -> com.android.tools.r8.code.s:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AndInt2Addr -> com.android.tools.r8.code.r:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4332,34 +4334,34 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AndIntLit16 -> com.android.tools.r8.code.t:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AndIntLit8 -> com.android.tools.r8.code.u:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AndLong -> com.android.tools.r8.code.w:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AndLong2Addr -> com.android.tools.r8.code.v:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -4367,75 +4369,75 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Aput -> com.android.tools.r8.code.x:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AputBoolean -> com.android.tools.r8.code.y:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AputByte -> com.android.tools.r8.code.z:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AputChar -> com.android.tools.r8.code.A:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AputObject -> com.android.tools.r8.code.B:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AputShort -> com.android.tools.r8.code.C:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.AputWide -> com.android.tools.r8.code.D:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ArrayLength -> com.android.tools.r8.code.E:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -4443,101 +4445,103 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Base1Format -> com.android.tools.r8.code.F:
     1:1:void <init>(com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
-    int getSize() -> s
+    int getSize() -> t
 com.android.tools.r8.code.Base2Format -> com.android.tools.r8.code.G:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> s
+    int getSize() -> t
 com.android.tools.r8.code.Base3Format -> com.android.tools.r8.code.H:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> s
+    int getSize() -> t
 com.android.tools.r8.code.Base4Format -> com.android.tools.r8.code.I:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> s
+    int getSize() -> t
 com.android.tools.r8.code.Base5Format -> com.android.tools.r8.code.J:
     1:1:void <init>():10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.code.BytecodeStream):13:13 -> <init>
-    int getSize() -> s
+    int getSize() -> t
 com.android.tools.r8.code.BaseInstructionFactory -> com.android.tools.r8.code.K:
     1:1:void <init>():8:8 -> <init>
 com.android.tools.r8.code.BytecodeStream -> com.android.tools.r8.internal.V2:
+com.android.tools.r8.code.CfOrDexInstruction -> com.android.tools.r8.internal.h4:
+    com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
 com.android.tools.r8.code.CheckCast -> com.android.tools.r8.code.L:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):24:24 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):28:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():89:89 -> D
+    1:1:com.android.tools.r8.graph.DexType getType():89:89 -> E
     1:1:int internalCompareBBBB(com.android.tools.r8.code.Format21c):48:48 -> a
     2:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:58 -> a
     4:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:69 -> a
-    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):70:70 -> a
     8:8:void registerUse(com.android.tools.r8.graph.UseRegistry):85:85 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):94:94 -> a
-    com.android.tools.r8.code.CheckCast asCheckCast() -> b
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    boolean isCheckCast() -> w
+    com.android.tools.r8.code.CheckCast asCheckCast() -> c
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    boolean isCheckCast() -> x
 com.android.tools.r8.code.CmpLong -> com.android.tools.r8.code.M:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.CmpgDouble -> com.android.tools.r8.code.N:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.CmpgFloat -> com.android.tools.r8.code.O:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.CmplDouble -> com.android.tools.r8.code.P:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.CmplFloat -> com.android.tools.r8.code.Q:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int,int,int):21:21 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):41:41 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Const -> com.android.tools.r8.code.U:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     3:3:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
@@ -4546,9 +4550,9 @@
     5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:10:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:62 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Const16 -> com.android.tools.r8.code.S:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -4556,19 +4560,19 @@
     1:1:int decodedValue():43:43 -> a
     2:2:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     4:4:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44:44 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     5:5:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     6:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):54:56 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Const4 -> com.android.tools.r8.code.T:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -4576,53 +4580,53 @@
     1:1:int decodedValue():43:43 -> a
     2:2:void com.android.tools.r8.code.Format11n.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format11n.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     4:6:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     7:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:62 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstClass -> com.android.tools.r8.code.V:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):24:24 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):28:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():79:79 -> D
+    1:1:com.android.tools.r8.graph.DexType getType():79:79 -> E
     1:1:int internalCompareBBBB(com.android.tools.r8.code.Format21c):33:33 -> a
     2:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:58 -> a
     4:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:69 -> a
-    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):70:70 -> a
     8:8:void registerUse(com.android.tools.r8.graph.UseRegistry):75:75 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):84:84 -> a
-    com.android.tools.r8.code.ConstClass asConstClass() -> c
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    com.android.tools.r8.code.ConstClass asConstClass() -> d
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstHigh16 -> com.android.tools.r8.code.W:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     3:3:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     5:5:int decodedValue():43:43 -> a
     6:8:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     9:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:62 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstMethodHandle -> com.android.tools.r8.code.X:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):27:27 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethodHandle):31:31 -> <init>
@@ -4641,7 +4645,7 @@
     12:12:int com.android.tools.r8.graph.DexMethodHandle.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):284:284 -> a
     12:12:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
     13:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88:88 -> a
-    14:14:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    14:14:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     14:14:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88 -> a
     15:15:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):89:89 -> a
     16:16:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):86:86 -> a
@@ -4649,10 +4653,10 @@
     18:18:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):65:65 -> a
     19:19:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):106:106 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):60:60 -> b
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstMethodType -> com.android.tools.r8.code.Y:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):26:26 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexProto):30:30 -> <init>
@@ -4665,25 +4669,25 @@
     6:6:com.android.tools.r8.graph.DexProto getMethodType():34:34 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):79:79 -> a
-    8:89:int com.android.tools.r8.graph.DexProto.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):0:81 -> a
-    8:89:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80 -> a
-    90:90:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84:84 -> a
-    91:91:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
-    91:91:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
-    92:92:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85:85 -> a
-    93:93:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82:82 -> a
-    94:94:int internalCompareBBBB(com.android.tools.r8.code.Format21c):54:54 -> a
-    95:95:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:64 -> a
-    96:96:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):100:100 -> a
+    8:93:int com.android.tools.r8.graph.DexProto.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):0:85 -> a
+    8:93:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):80 -> a
+    94:94:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84:84 -> a
+    95:95:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
+    95:95:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
+    96:96:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):85:85 -> a
+    97:97:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82:82 -> a
+    98:98:int internalCompareBBBB(com.android.tools.r8.code.Format21c):54:54 -> a
+    99:99:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):64:64 -> a
+    100:100:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):59:59 -> b
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstString -> com.android.tools.r8.code.Z:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):25:25 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexString):29:29 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getString():33:33 -> D
+    1:1:com.android.tools.r8.graph.DexString getString():33:33 -> E
     1:1:int internalCompareBBBB(com.android.tools.r8.code.Format21c):38:38 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
     3:246:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:243 -> a
@@ -4693,30 +4697,30 @@
     249:497:int com.android.tools.r8.graph.DexString.getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):0:248 -> a
     249:497:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):92 -> a
     498:498:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):96:96 -> a
-    499:499:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    499:499:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     499:499:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):96 -> a
     500:500:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):97:97 -> a
     501:501:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):94:94 -> a
     502:502:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):102:102 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):77:77 -> b
-    com.android.tools.r8.code.ConstString asConstString() -> d
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    boolean isConstString() -> x
+    com.android.tools.r8.code.ConstString asConstString() -> e
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    boolean isConstString() -> y
 com.android.tools.r8.code.ConstStringJumbo -> com.android.tools.r8.code.a0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexString):22:22 -> <init>
-    1:1:com.android.tools.r8.graph.DexString getString():26:26 -> D
+    1:1:com.android.tools.r8.graph.DexString getString():26:26 -> E
     1:1:void com.android.tools.r8.code.Format31c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44:44 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format31c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     3:3:void com.android.tools.r8.code.Format31c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45:45 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):126:126 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):127:127 -> a
     4:4:void com.android.tools.r8.code.Format31c.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):61:61 -> a
@@ -4727,11 +4731,11 @@
     8:251:void com.android.tools.r8.code.Format31c.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):72 -> a
     8:251:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):56:56 -> b
-    com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> e
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> f
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstWide -> com.android.tools.r8.code.d0:
     short com.android.tools.r8.code.Format51l.AA -> f
     long com.android.tools.r8.code.Format51l.BBBBBBBBBBBBBBBB -> g
@@ -4739,7 +4743,7 @@
     1:1:void com.android.tools.r8.code.Format51l.<clinit>():16:16 -> <clinit>
     1:2:void com.android.tools.r8.code.Format51l.<init>(int,com.android.tools.r8.code.BytecodeStream):23:24 -> <init>
     1:2:void <init>(int,com.android.tools.r8.code.BytecodeStream):19 -> <init>
-    3:4:long com.android.tools.r8.code.Instruction.read64BitValue(com.android.tools.r8.code.BytecodeStream):73:74 -> <init>
+    3:4:long com.android.tools.r8.code.Instruction.read64BitValue(com.android.tools.r8.code.BytecodeStream):74:75 -> <init>
     3:4:void com.android.tools.r8.code.Format51l.<init>(int,com.android.tools.r8.code.BytecodeStream):25 -> <init>
     3:4:void <init>(int,com.android.tools.r8.code.BytecodeStream):19 -> <init>
     5:5:void com.android.tools.r8.code.Format51l.<init>(int,com.android.tools.r8.code.BytecodeStream):25:25 -> <init>
@@ -4750,12 +4754,12 @@
     int com.android.tools.r8.code.Format51l.internalCompareTo(com.android.tools.r8.code.Instruction) -> a
     1:1:void com.android.tools.r8.code.Format51l.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format51l.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     3:3:void com.android.tools.r8.code.Format51l.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    4:5:void com.android.tools.r8.code.Instruction.write64BitValue(long,java.nio.ShortBuffer):113:114 -> a
+    4:5:void com.android.tools.r8.code.Instruction.write64BitValue(long,java.nio.ShortBuffer):114:115 -> a
     4:5:void com.android.tools.r8.code.Format51l.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     4:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     6:6:long decodedValue():43:43 -> a
@@ -4767,9 +4771,9 @@
     1:3:int com.android.tools.r8.code.Format51l.internalCompareTo(com.android.tools.r8.code.Instruction):52:54 -> c
     1:1:int com.android.tools.r8.code.Format51l.hashCode():47:47 -> hashCode
     1:1:int com.android.tools.r8.code.Format51l.hashCode():0 -> hashCode
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstWide16 -> com.android.tools.r8.code.b0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
@@ -4777,27 +4781,27 @@
     1:1:long decodedValue():43:43 -> a
     2:2:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     4:4:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44:44 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     5:5:void com.android.tools.r8.code.Format21s.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     6:8:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstWide32 -> com.android.tools.r8.code.c0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     3:3:void com.android.tools.r8.code.Format31i.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
@@ -4806,30 +4810,30 @@
     5:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     8:8:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ConstWideHigh16 -> com.android.tools.r8.code.e0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>(int,int):23:23 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     3:3:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void com.android.tools.r8.code.Format21h.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):12 -> a
     5:5:long decodedValue():43:43 -> a
     6:8:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):60:60 -> a
     1:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):48:48 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DexCompareHelper -> com.android.tools.r8.code.f0:
     int DEX_ITEM_CONST_STRING_COMPARE_ID -> b
     int HIGHEST_DEX_OPCODE -> c
@@ -4837,7 +4841,7 @@
     boolean $assertionsDisabled -> d
     1:13:void <clinit>():6:18 -> <clinit>
     1:1:int compareIdUniquelyDeterminesEquality(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):24:24 -> a
-    2:2:int com.android.tools.r8.code.Instruction.getCompareToId():293:293 -> a
+    2:2:int com.android.tools.r8.code.Instruction.getCompareToId():304:304 -> a
     2:2:int compareIdUniquelyDeterminesEquality(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):25 -> a
     3:4:int compareIdUniquelyDeterminesEquality(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):25:26 -> a
 com.android.tools.r8.code.DexInitClass -> com.android.tools.r8.code.g0:
@@ -4859,18 +4863,18 @@
     1:1:com.android.tools.r8.graph.DexType lambda$internalCompareTo$1(com.android.tools.r8.code.DexInitClass):132:132 -> b
     2:8:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):143:149 -> b
     1:1:int hashCode():126:126 -> hashCode
-    boolean canThrow() -> j
-    1:1:int getCompareToId():77:77 -> l
-    java.lang.String getName() -> o
-    1:1:int getOpcode():72:72 -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    1:1:int getCompareToId():77:77 -> m
+    java.lang.String getName() -> p
+    1:1:int getOpcode():72:72 -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DexItemBasedConstString -> com.android.tools.r8.code.h0:
     boolean $assertionsDisabled -> h
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> i
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):28:29 -> <init>
-    1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> D
-    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():37:37 -> E
+    1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> E
+    1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():37:37 -> F
     1:1:com.android.tools.r8.graph.DexReference getItem():33:33 -> a
     1:1:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46 -> a
     2:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46:46 -> a
@@ -4888,20 +4892,20 @@
     12:12:void registerUse(com.android.tools.r8.graph.UseRegistry):112:112 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):118:118 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):88:88 -> b
-    com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> f
-    boolean canThrow() -> j
-    1:1:int getCompareToId():67:67 -> l
-    java.lang.String getName() -> o
-    1:1:int getOpcode():61:61 -> q
-    java.lang.String getSmaliName() -> t
+    com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> g
+    boolean canThrow() -> k
+    1:1:int getCompareToId():67:67 -> m
+    java.lang.String getName() -> p
+    1:1:int getOpcode():61:61 -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivDouble -> com.android.tools.r8.code.j0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivDouble2Addr -> com.android.tools.r8.code.i0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4909,20 +4913,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivFloat -> com.android.tools.r8.code.l0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivFloat2Addr -> com.android.tools.r8.code.k0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4930,21 +4934,21 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivInt -> com.android.tools.r8.code.n0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivInt2Addr -> com.android.tools.r8.code.m0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4952,38 +4956,38 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivIntLit16 -> com.android.tools.r8.code.o0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivIntLit8 -> com.android.tools.r8.code.p0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivLong -> com.android.tools.r8.code.r0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DivLong2Addr -> com.android.tools.r8.code.q0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -4991,13 +4995,13 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DoubleToFloat -> com.android.tools.r8.code.s0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -5005,12 +5009,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DoubleToInt -> com.android.tools.r8.code.t0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -5018,12 +5022,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.DoubleToLong -> com.android.tools.r8.code.u0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -5031,12 +5035,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.FillArrayData -> com.android.tools.r8.code.v0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
@@ -5045,10 +5049,10 @@
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     4:4:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):45:45 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.FillArrayDataPayload -> com.android.tools.r8.code.w0:
     short[] data -> i
     long size -> h
@@ -5060,13 +5064,13 @@
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     1:4:int internalCompareTo(com.android.tools.r8.code.Instruction):66:69 -> a
     5:5:int lambda$internalCompareTo$0(com.android.tools.r8.code.FillArrayDataPayload):66:66 -> a
-    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:57 -> a
-    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57 -> a
     9:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58:59 -> a
-    11:11:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    11:11:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     11:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60 -> a
     12:51:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):94:133 -> a
     1:1:long lambda$internalCompareTo$1(com.android.tools.r8.code.FillArrayDataPayload):67:67 -> b
@@ -5077,7 +5081,7 @@
     4:4:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):88:88 -> b
     1:1:short[] lambda$internalCompareTo$2(com.android.tools.r8.code.FillArrayDataPayload):68:68 -> c
     1:3:int hashCode():75:77 -> hashCode
-    1:1:int getSize():83:83 -> s
+    1:1:int getSize():83:83 -> t
 com.android.tools.r8.code.FilledNewArray -> com.android.tools.r8.code.x0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):23:23 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType,int,int,int,int,int):27:27 -> <init>
@@ -5091,15 +5095,15 @@
     7:7:com.android.tools.r8.graph.DexType getType():61:61 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
     8:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81:82 -> a
-    10:10:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    10:10:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     10:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
     11:12:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:84 -> a
-    13:13:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    13:13:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     13:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.FilledNewArrayRange -> com.android.tools.r8.code.y0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):23:23 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):27:27 -> <init>
@@ -5113,15 +5117,15 @@
     7:7:com.android.tools.r8.graph.DexType getType():61:61 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81 -> a
     8:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):81:82 -> a
-    10:10:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    10:10:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     10:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
     11:12:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83:84 -> a
-    13:13:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    13:13:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     13:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.FloatToDouble -> com.android.tools.r8.code.z0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -5129,12 +5133,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.FloatToInt -> com.android.tools.r8.code.A0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -5142,12 +5146,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.FloatToLong -> com.android.tools.r8.code.B0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -5155,12 +5159,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Format10x -> com.android.tools.r8.code.C0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):19:19 -> <init>
     2:2:void <init>():22:22 -> <init>
@@ -5173,7 +5177,7 @@
     9:13:void <init>(int,int):33:37 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47 -> a
     3:4:int internalCompareTo(com.android.tools.r8.code.Instruction):57:58 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):63:63 -> b
@@ -5197,7 +5201,7 @@
     4:8:void <init>(int,int):27:31 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:4:int internalCompareTo(com.android.tools.r8.code.Instruction):51:52 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):63:63 -> a
@@ -5233,10 +5237,10 @@
     4:8:void <init>(int,int):29:33 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44:44 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44 -> a
     5:6:int internalCompareTo(com.android.tools.r8.code.Instruction):54:55 -> a
     7:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):65:65 -> a
@@ -5249,21 +5253,21 @@
     1:1:void <clinit>():19:19 -> <clinit>
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream):26:28 -> <init>
     4:8:void <init>(int,int):31:35 -> <init>
-    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> D
-    com.android.tools.r8.ir.code.If$Type getType() -> E
+    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> E
+    com.android.tools.r8.ir.code.If$Type getType() -> F
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45:45 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46:46 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46 -> a
     5:6:int internalCompareTo(com.android.tools.r8.code.Instruction):56:57 -> a
     7:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):71:73 -> a
     10:10:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):83:83 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):78:78 -> b
     1:1:int hashCode():51:51 -> hashCode
-    1:1:int[] getTargets():66:66 -> u
+    1:1:int[] getTargets():66:66 -> v
 com.android.tools.r8.code.Format22b -> com.android.tools.r8.code.K0:
     short BB -> g
     short AA -> f
@@ -5274,10 +5278,10 @@
     5:11:void <init>(int,int,int):31:37 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48:48 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48 -> a
     5:6:int internalCompareTo(com.android.tools.r8.code.Instruction):58:59 -> a
     7:9:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):69:69 -> a
@@ -5305,10 +5309,10 @@
     5:11:void <init>(int,int,int):31:37 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48:48 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48 -> a
     5:6:int internalCompareTo(com.android.tools.r8.code.Instruction):58:59 -> a
     7:9:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):69:69 -> a
@@ -5322,21 +5326,21 @@
     1:1:void <clinit>():19:19 -> <clinit>
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream):27:30 -> <init>
     5:11:void <init>(int,int,int):33:39 -> <init>
-    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> D
-    com.android.tools.r8.ir.code.If$Type getType() -> E
+    com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint() -> E
+    com.android.tools.r8.ir.code.If$Type getType() -> F
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49:49 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):49 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50:50 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):50 -> a
     5:6:int internalCompareTo(com.android.tools.r8.code.Instruction):60:61 -> a
     7:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):75:77 -> a
     10:10:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):87:87 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):82:82 -> b
     1:1:int hashCode():55:55 -> hashCode
-    1:1:int[] getTargets():70:70 -> u
+    1:1:int[] getTargets():70:70 -> v
 com.android.tools.r8.code.Format22x -> com.android.tools.r8.code.O0:
     char BBBB -> g
     short AA -> f
@@ -5357,10 +5361,10 @@
     1:4:void <init>(int,com.android.tools.r8.code.BytecodeStream):24:27 -> <init>
     5:11:void <init>(int,int,int):30:36 -> <init>
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46:46 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47:47 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47 -> a
     5:6:int internalCompareTo(com.android.tools.r8.code.Instruction):57:58 -> a
     7:7:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):68:68 -> a
@@ -5373,11 +5377,11 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:int internalCompareTo(com.android.tools.r8.code.Instruction):46:46 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):56:56 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):35 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):36:36 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):51:51 -> b
-    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):230:230 -> b
+    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):241:241 -> b
     2:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):51 -> b
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):51:51 -> b
     1:1:int hashCode():41:41 -> hashCode
@@ -5389,10 +5393,10 @@
     1:3:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexString[]):26:28 -> <init>
     4:7:void <init>(int,com.android.tools.r8.graph.DexString):31:34 -> <init>
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44:44 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45:45 -> a
-    4:4:void com.android.tools.r8.code.Instruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):126:126 -> a
+    4:4:void com.android.tools.r8.code.Instruction.write32BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):127:127 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45 -> a
     5:7:int internalCompareTo(com.android.tools.r8.code.Instruction):55:57 -> a
     8:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):72:72 -> a
@@ -5418,15 +5422,15 @@
     4:7:void <init>(int,int):28:31 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:43 -> a
     5:6:int internalCompareTo(com.android.tools.r8.code.Instruction):67:68 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):73:73 -> b
     1:1:void setPayloadOffset(int):57:57 -> h
     1:1:int hashCode():62:62 -> hashCode
-    1:1:int getPayloadOffset():53:53 -> r
-    boolean hasPayload() -> v
+    1:1:int getPayloadOffset():53:53 -> s
+    boolean hasPayload() -> w
 com.android.tools.r8.code.Format32x -> com.android.tools.r8.code.U0:
     boolean $assertionsDisabled -> e
     int AAAA -> f
@@ -5436,13 +5440,13 @@
     4:8:void <init>(int,int):29:33 -> <init>
     1:2:int internalCompareTo(com.android.tools.r8.code.Instruction):55:56 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):66:66 -> a
-    4:4:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    4:4:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44:44 -> a
-    6:6:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    6:6:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):44 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45:45 -> a
-    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):45 -> a
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):61:61 -> b
     1:1:int hashCode():50:50 -> hashCode
@@ -5489,7 +5493,7 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format10t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format10t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
@@ -5501,10 +5505,10 @@
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
     1:1:int com.android.tools.r8.code.Format10t.hashCode():42:42 -> hashCode
     1:1:int com.android.tools.r8.code.Format10t.hashCode():0 -> hashCode
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    1:1:int[] getTargets():39:39 -> u
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    1:1:int[] getTargets():39:39 -> v
 com.android.tools.r8.code.Goto16 -> com.android.tools.r8.code.X0:
     short com.android.tools.r8.code.Format20t.AAAA -> f
     boolean com.android.tools.r8.code.Format20t.$assertionsDisabled -> e
@@ -5519,306 +5523,307 @@
     2:2:int com.android.tools.r8.code.Format20t.internalCompareTo(com.android.tools.r8.code.Instruction):0 -> a
     3:3:java.lang.String com.android.tools.r8.code.Format20t.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):57:57 -> a
     3:3:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
-    4:4:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    4:4:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     4:4:void com.android.tools.r8.code.Format20t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):36 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     5:5:void com.android.tools.r8.code.Format20t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    6:6:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    6:6:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     6:6:void com.android.tools.r8.code.Format20t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format20t.toString(com.android.tools.r8.naming.ClassNameMapper):52:52 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
     1:1:int com.android.tools.r8.code.Format20t.hashCode():42:42 -> hashCode
     1:1:int com.android.tools.r8.code.Format20t.hashCode():0 -> hashCode
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    1:1:int[] getTargets():39:39 -> u
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    1:1:int[] getTargets():39:39 -> v
 com.android.tools.r8.code.Goto32 -> com.android.tools.r8.code.Y0:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format30t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):35 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void com.android.tools.r8.code.Format30t.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):36:36 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format30t.toString(com.android.tools.r8.naming.ClassNameMapper):51:51 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):230:230 -> b
+    2:2:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):241:241 -> b
     2:2:java.lang.String com.android.tools.r8.code.Format30t.toString(com.android.tools.r8.naming.ClassNameMapper):51 -> b
     2:2:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
     3:3:java.lang.String com.android.tools.r8.code.Format30t.toString(com.android.tools.r8.naming.ClassNameMapper):51:51 -> b
     3:3:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    1:1:int[] getTargets():39:39 -> u
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    1:1:int[] getTargets():39:39 -> v
 com.android.tools.r8.code.IfEq -> com.android.tools.r8.code.a1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfEqz -> com.android.tools.r8.code.b1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfGe -> com.android.tools.r8.code.c1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfGez -> com.android.tools.r8.code.d1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfGt -> com.android.tools.r8.code.e1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfGtz -> com.android.tools.r8.code.f1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfLe -> com.android.tools.r8.code.g1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfLez -> com.android.tools.r8.code.h1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfLt -> com.android.tools.r8.code.i1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfLtz -> com.android.tools.r8.code.j1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfNe -> com.android.tools.r8.code.k1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IfNez -> com.android.tools.r8.code.l1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
-    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> D
-    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> E
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    1:1:com.android.tools.r8.ir.code.ValueTypeConstraint getOperandTypeConstraint():45:45 -> E
+    1:1:com.android.tools.r8.ir.code.If$Type getType():40:40 -> F
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Iget -> com.android.tools.r8.code.m1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IgetBoolean -> com.android.tools.r8.code.n1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IgetByte -> com.android.tools.r8.code.o1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IgetChar -> com.android.tools.r8.code.p1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IgetObject -> com.android.tools.r8.code.q1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IgetOrIput -> com.android.tools.r8.code.r1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexField[]):17:17 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):21:21 -> <init>
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):30:31 -> a
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):46:47 -> a
-    5:5:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    5:5:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):47 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):48:48 -> a
-    1:1:com.android.tools.r8.graph.DexField getField():36:36 -> m
+    1:1:com.android.tools.r8.graph.DexField getField():36:36 -> n
 com.android.tools.r8.code.IgetShort -> com.android.tools.r8.code.s1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IgetWide -> com.android.tools.r8.code.t1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InstanceOf -> com.android.tools.r8.code.u1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):24:24 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):28:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():67:67 -> D
+    1:1:com.android.tools.r8.graph.DexType getType():67:67 -> E
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):62:63 -> a
     3:3:void registerUse(com.android.tools.r8.graph.UseRegistry):72:72 -> a
     4:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):77:77 -> a
     5:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):92:93 -> a
-    7:7:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    7:7:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):93 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):94:94 -> a
-    com.android.tools.r8.code.InstanceOf asInstanceOf() -> g
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    com.android.tools.r8.code.InstanceOf asInstanceOf() -> h
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Instruction -> com.android.tools.r8.code.v1:
     int[] EXIT_TARGET -> b
     int offset -> d
     com.android.tools.r8.code.Instruction[] EMPTY_ARRAY -> a
     boolean $assertionsDisabled -> c
-    1:5:void <clinit>():24:28 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.code.BytecodeStream):32:34 -> <init>
-    4:5:void <init>():37:38 -> <init>
-    boolean isPayload() -> A
-    1:1:boolean isSimpleNop():202:202 -> B
-    boolean isSwitchPayload() -> C
+    1:5:void <clinit>():25:29 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.code.BytecodeStream):33:35 -> <init>
+    4:5:void <init>():38:39 -> <init>
+    boolean isIntSwitch() -> A
+    boolean isPayload() -> B
+    1:1:boolean isSimpleNop():213:213 -> C
+    boolean isSwitchPayload() -> D
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     int internalCompareTo(com.android.tools.r8.code.Instruction) -> a
     void registerUse(com.android.tools.r8.graph.UseRegistry) -> a
     java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper) -> a
     void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
-    1:1:char read16BitValue(com.android.tools.r8.code.BytecodeStream):55:55 -> a
-    2:2:void writeFirst(int,java.nio.ShortBuffer,int):92:92 -> a
-    3:3:void writeFirst(int,int,java.nio.ShortBuffer,int):100:100 -> a
-    4:5:void write32BitValue(long,java.nio.ShortBuffer):108:109 -> a
-    6:7:void write16BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):119:120 -> a
-    8:8:void write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
-    8:8:void write16BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):121 -> a
-    9:17:java.lang.String formatSmaliString(java.lang.String):251:259 -> a
-    18:18:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):329:329 -> a
-    com.android.tools.r8.code.CheckCast asCheckCast() -> b
+    1:1:char read16BitValue(com.android.tools.r8.code.BytecodeStream):56:56 -> a
+    2:2:void writeFirst(int,java.nio.ShortBuffer,int):93:93 -> a
+    3:3:void writeFirst(int,int,java.nio.ShortBuffer,int):101:101 -> a
+    4:5:void write32BitValue(long,java.nio.ShortBuffer):109:110 -> a
+    6:7:void write16BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):120:121 -> a
+    8:8:void write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
+    8:8:void write16BitReference(com.android.tools.r8.graph.IndexedDexItem,java.nio.ShortBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):122 -> a
+    9:17:java.lang.String formatSmaliString(java.lang.String):262:270 -> a
+    18:18:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):340:340 -> a
+    com.android.tools.r8.cf.code.CfInstruction asCfInstruction() -> b
     java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper) -> b
-    1:2:long read32BitValue(com.android.tools.r8.code.BytecodeStream):66:67 -> b
-    3:3:java.lang.String formatRelativeOffset(int):238:238 -> b
-    4:4:java.lang.String formatOffset(int):230:230 -> b
-    4:4:java.lang.String formatRelativeOffset(int):238 -> b
-    5:5:java.lang.String formatRelativeOffset(int):238:238 -> b
-    6:6:java.lang.String formatDecimalOffset(int):234:234 -> b
-    6:6:java.lang.String formatRelativeOffset(int):238 -> b
-    7:7:java.lang.String formatRelativeOffset(int):238:238 -> b
-    8:9:java.lang.String formatString(java.lang.String):242:243 -> b
-    10:10:java.lang.String formatOffset(int):230:230 -> b
-    10:10:java.lang.String formatString(java.lang.String):243 -> b
-    11:15:java.lang.String formatString(java.lang.String):243:247 -> b
-    16:16:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):317:317 -> b
-    com.android.tools.r8.code.ConstClass asConstClass() -> c
-    1:1:short read8BitValue(com.android.tools.r8.code.BytecodeStream):46:46 -> c
-    1:1:int compareTo(java.lang.Object):24:24 -> compareTo
-    2:3:int compareTo(com.android.tools.r8.code.Instruction):304:305 -> compareTo
-    2:3:int compareTo(java.lang.Object):24 -> compareTo
-    com.android.tools.r8.code.ConstString asConstString() -> d
+    1:2:long read32BitValue(com.android.tools.r8.code.BytecodeStream):67:68 -> b
+    3:3:java.lang.String formatRelativeOffset(int):249:249 -> b
+    4:4:java.lang.String formatOffset(int):241:241 -> b
+    4:4:java.lang.String formatRelativeOffset(int):249 -> b
+    5:5:java.lang.String formatRelativeOffset(int):249:249 -> b
+    6:6:java.lang.String formatDecimalOffset(int):245:245 -> b
+    6:6:java.lang.String formatRelativeOffset(int):249 -> b
+    7:7:java.lang.String formatRelativeOffset(int):249:249 -> b
+    8:9:java.lang.String formatString(java.lang.String):253:254 -> b
+    10:10:java.lang.String formatOffset(int):241:241 -> b
+    10:10:java.lang.String formatString(java.lang.String):254 -> b
+    11:15:java.lang.String formatString(java.lang.String):254:258 -> b
+    16:16:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):328:328 -> b
+    com.android.tools.r8.code.CheckCast asCheckCast() -> c
+    1:1:short read8BitValue(com.android.tools.r8.code.BytecodeStream):47:47 -> c
+    1:1:int compareTo(java.lang.Object):25:25 -> compareTo
+    2:3:int compareTo(com.android.tools.r8.code.Instruction):315:316 -> compareTo
+    2:3:int compareTo(java.lang.Object):25 -> compareTo
+    com.android.tools.r8.code.ConstClass asConstClass() -> d
     short combineBytes(int,int) -> d
-    1:1:short readSigned16BitValue(com.android.tools.r8.code.BytecodeStream):51:51 -> d
-    com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> e
+    1:1:short readSigned16BitValue(com.android.tools.r8.code.BytecodeStream):52:52 -> d
+    com.android.tools.r8.code.ConstString asConstString() -> e
     int makeByte(int,int) -> e
-    1:2:int readSigned32BitValue(com.android.tools.r8.code.BytecodeStream):59:60 -> e
-    1:1:boolean equals(java.lang.Object):286:286 -> equals
-    2:3:int compareTo(com.android.tools.r8.code.Instruction):304:305 -> equals
-    2:3:boolean equals(java.lang.Object):286 -> equals
-    com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> f
-    1:1:byte readSigned8BitValue(com.android.tools.r8.code.BytecodeStream):42:42 -> f
-    com.android.tools.r8.code.InstanceOf asInstanceOf() -> g
-    1:1:void setOffset(int):134:134 -> g
-    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> h
-    com.android.tools.r8.code.InvokeVirtualRange asInvokeVirtualRange() -> i
-    boolean canThrow() -> j
-    com.android.tools.r8.graph.DexCallSite getCallSite() -> k
-    1:1:int getCompareToId():293:293 -> l
-    com.android.tools.r8.graph.DexField getField() -> m
-    com.android.tools.r8.graph.DexMethod getMethod() -> n
-    java.lang.String getName() -> o
-    1:1:int getOffset():130:130 -> p
-    int getOpcode() -> q
-    int getPayloadOffset() -> r
-    int getSize() -> s
-    java.lang.String getSmaliName() -> t
-    1:1:java.lang.String toString():334:334 -> toString
-    int[] getTargets() -> u
-    boolean hasPayload() -> v
-    boolean isCheckCast() -> w
-    boolean isConstString() -> x
-    boolean isDexItemBasedConstString() -> y
-    boolean isIntSwitch() -> z
+    1:2:int readSigned32BitValue(com.android.tools.r8.code.BytecodeStream):60:61 -> e
+    1:1:boolean equals(java.lang.Object):297:297 -> equals
+    2:3:int compareTo(com.android.tools.r8.code.Instruction):315:316 -> equals
+    2:3:boolean equals(java.lang.Object):297 -> equals
+    com.android.tools.r8.code.ConstStringJumbo asConstStringJumbo() -> f
+    1:1:byte readSigned8BitValue(com.android.tools.r8.code.BytecodeStream):43:43 -> f
+    com.android.tools.r8.code.DexItemBasedConstString asDexItemBasedConstString() -> g
+    1:1:void setOffset(int):135:135 -> g
+    com.android.tools.r8.code.InstanceOf asInstanceOf() -> h
+    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> i
+    com.android.tools.r8.code.InvokeVirtualRange asInvokeVirtualRange() -> j
+    boolean canThrow() -> k
+    com.android.tools.r8.graph.DexCallSite getCallSite() -> l
+    1:1:int getCompareToId():304:304 -> m
+    com.android.tools.r8.graph.DexField getField() -> n
+    com.android.tools.r8.graph.DexMethod getMethod() -> o
+    java.lang.String getName() -> p
+    1:1:int getOffset():131:131 -> q
+    int getOpcode() -> r
+    int getPayloadOffset() -> s
+    int getSize() -> t
+    1:1:java.lang.String toString():345:345 -> toString
+    java.lang.String getSmaliName() -> u
+    int[] getTargets() -> v
+    boolean hasPayload() -> w
+    boolean isCheckCast() -> x
+    boolean isConstString() -> y
+    boolean isDexItemBasedConstString() -> z
 com.android.tools.r8.code.InstructionFactory -> com.android.tools.r8.code.w1:
     1:1:void <init>():11:11 -> <init>
     1:4:com.android.tools.r8.code.Instruction[] readSequenceFrom(java.nio.ShortBuffer,int,int,com.android.tools.r8.graph.OffsetToObjectMapping):22:25 -> a
@@ -6526,12 +6531,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IntToChar -> com.android.tools.r8.code.y1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6539,12 +6544,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IntToDouble -> com.android.tools.r8.code.z1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6552,12 +6557,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IntToFloat -> com.android.tools.r8.code.A1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -6565,12 +6570,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IntToLong -> com.android.tools.r8.code.B1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6578,12 +6583,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IntToShort -> com.android.tools.r8.code.C1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -6591,12 +6596,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeCustom -> com.android.tools.r8.code.D1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):24:24 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexCallSite,int,int,int,int,int):28:28 -> <init>
@@ -6613,18 +6618,18 @@
     1584:1584:void registerUse(com.android.tools.r8.graph.UseRegistry):63 -> a
     1585:1585:void registerUse(com.android.tools.r8.graph.UseRegistry):63:63 -> a
     1586:1586:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88:88 -> a
-    1587:1587:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    1587:1587:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     1587:1587:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88 -> a
     1588:1588:com.android.tools.r8.graph.DexCallSite getCallSite():68:68 -> a
     1588:1588:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):89 -> a
     1589:1590:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):89:90 -> a
-    1591:1591:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    1591:1591:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     1591:1591:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):90 -> a
-    boolean canThrow() -> j
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():68:68 -> k
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():68:68 -> l
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeCustomRange -> com.android.tools.r8.code.E1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):24:24 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexCallSite):28:28 -> <init>
@@ -6641,76 +6646,76 @@
     9:9:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> a
     9:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88 -> a
     10:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):88:89 -> a
-    12:12:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    12:12:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     12:12:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):89 -> a
     13:14:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):90:91 -> a
-    15:15:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    15:15:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     15:15:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):91 -> a
-    boolean canThrow() -> j
-    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> k
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    1:1:com.android.tools.r8.graph.DexCallSite getCallSite():63:63 -> l
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeDirect -> com.android.tools.r8.code.F1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeDirectRange -> com.android.tools.r8.code.G1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeInterface -> com.android.tools.r8.code.H1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeInterfaceRange -> com.android.tools.r8.code.I1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeMethod -> com.android.tools.r8.code.J1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexMethod[]):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
-    com.android.tools.r8.ir.code.Invoke$Type getInvokeType() -> D
+    com.android.tools.r8.ir.code.Invoke$Type getInvokeType() -> E
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33:34 -> a
     3:3:int internalCompareBBBB(com.android.tools.r8.code.Format35c):46:46 -> a
     4:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:60 -> a
-    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():39:39 -> n
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():39:39 -> o
 com.android.tools.r8.code.InvokeMethodRange -> com.android.tools.r8.code.K1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexMethod[]):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
-    com.android.tools.r8.ir.code.Invoke$Type getInvokeType() -> D
+    com.android.tools.r8.ir.code.Invoke$Type getInvokeType() -> E
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):33:34 -> a
     3:3:int internalCompareBBBB(com.android.tools.r8.code.Format3rc):46:46 -> a
     4:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:60 -> a
-    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60 -> a
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():39:39 -> n
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():39:39 -> o
 com.android.tools.r8.code.InvokePolymorphic -> com.android.tools.r8.code.L1:
     byte com.android.tools.r8.code.Format45cc.F -> j
     byte com.android.tools.r8.code.Format45cc.E -> i
@@ -6743,8 +6748,8 @@
     27:27:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():0:0 -> a
     27:27:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):138 -> a
     27:27:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    28:28:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():108:108 -> a
-    28:28:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():104 -> a
+    28:28:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():112:112 -> a
+    28:28:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():108 -> a
     28:28:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):138 -> a
     28:28:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
     29:30:java.lang.String com.android.tools.r8.code.Format45cc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):138:139 -> a
@@ -6769,12 +6774,12 @@
     50:50:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     51:53:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):120:122 -> a
     51:53:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
-    54:54:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    54:54:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     54:54:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):122 -> a
     54:54:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     55:56:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):123:124 -> a
     55:56:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
-    57:57:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    57:57:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     57:57:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):124 -> a
     57:57:void com.android.tools.r8.code.Format45cc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     58:58:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format45cc.getProto():182:182 -> a
@@ -6787,12 +6792,12 @@
     1:7:java.lang.String com.android.tools.r8.code.Format45cc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
     1:9:int com.android.tools.r8.code.Format45cc.hashCode():68:76 -> hashCode
     1:9:int com.android.tools.r8.code.Format45cc.hashCode():0 -> hashCode
-    boolean canThrow() -> j
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():177:177 -> n
-    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0 -> n
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():177:177 -> o
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.code.Format45cc.getMethod():0 -> o
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokePolymorphicRange -> com.android.tools.r8.code.M1:
     char com.android.tools.r8.code.Format4rcc.CCCC -> g
     com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.HHHH -> i
@@ -6825,12 +6830,12 @@
     10:10:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     11:13:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56:58 -> a
     11:13:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
-    14:14:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    14:14:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     14:14:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58 -> a
     14:14:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     15:16:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):59:60 -> a
     15:16:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
-    17:17:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    17:17:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     17:17:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):60 -> a
     17:17:void com.android.tools.r8.code.Format4rcc.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):0 -> a
     18:18:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.getProto():155:155 -> a
@@ -6852,8 +6857,8 @@
     33:33:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():0:0 -> a
     33:33:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):107 -> a
     33:33:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
-    34:34:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():108:108 -> a
-    34:34:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():104 -> a
+    34:34:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():112:112 -> a
+    34:34:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():108 -> a
     34:34:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):107 -> a
     34:34:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):0 -> a
     35:36:java.lang.String com.android.tools.r8.code.Format4rcc.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):107:108 -> a
@@ -6865,8 +6870,8 @@
     12:12:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():0:0 -> b
     12:12:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):92 -> b
     12:12:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
-    13:13:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():108:108 -> b
-    13:13:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():104 -> b
+    13:13:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():112:112 -> b
+    13:13:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():108 -> b
     13:13:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):92 -> b
     13:13:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):0 -> b
     14:18:java.lang.String com.android.tools.r8.code.Format4rcc.toString(com.android.tools.r8.naming.ClassNameMapper):92:96 -> b
@@ -6876,136 +6881,136 @@
     1:1:com.android.tools.r8.graph.DexProto com.android.tools.r8.code.Format4rcc.lambda$internalCompareTo$3(com.android.tools.r8.code.Format4rcc):77:77 -> d
     1:2:int com.android.tools.r8.code.Format4rcc.hashCode():68:69 -> hashCode
     1:2:int com.android.tools.r8.code.Format4rcc.hashCode():0 -> hashCode
-    boolean canThrow() -> j
-    1:1:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> n
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    1:1:com.android.tools.r8.graph.DexMethod getMethod():46:46 -> o
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeStatic -> com.android.tools.r8.code.N1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeStaticRange -> com.android.tools.r8.code.O1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeSuper -> com.android.tools.r8.code.P1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeSuperRange -> com.android.tools.r8.code.Q1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):48:48 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):53:53 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeVirtual -> com.android.tools.r8.code.R1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexMethod,int,int,int,int,int):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):58:58 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
-    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> h
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    com.android.tools.r8.code.InvokeVirtual asInvokeVirtual() -> i
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.InvokeVirtualRange -> com.android.tools.r8.code.S1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):19:19 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexMethod):23:23 -> <init>
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> D
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getInvokeType():28:28 -> E
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):58:58 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):63:63 -> a
-    com.android.tools.r8.code.InvokeVirtualRange asInvokeVirtualRange() -> i
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    com.android.tools.r8.code.InvokeVirtualRange asInvokeVirtualRange() -> j
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Iput -> com.android.tools.r8.code.T1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IputBoolean -> com.android.tools.r8.code.U1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IputByte -> com.android.tools.r8.code.V1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IputChar -> com.android.tools.r8.code.W1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IputObject -> com.android.tools.r8.code.X1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IputShort -> com.android.tools.r8.code.Y1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.IputWide -> com.android.tools.r8.code.Z1:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:1:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.LongToDouble -> com.android.tools.r8.code.a2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7013,12 +7018,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.LongToFloat -> com.android.tools.r8.code.b2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7026,12 +7031,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.LongToInt -> com.android.tools.r8.code.c2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7039,40 +7044,40 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MonitorEnter -> com.android.tools.r8.code.d2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MonitorExit -> com.android.tools.r8.code.e2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Move -> com.android.tools.r8.code.g2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7080,33 +7085,33 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Move16 -> com.android.tools.r8.code.f2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveException -> com.android.tools.r8.code.h2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveFrom16 -> com.android.tools.r8.code.i2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7114,17 +7119,17 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
     4:4:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     5:5:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveObject -> com.android.tools.r8.code.k2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7134,12 +7139,12 @@
     2:1323:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
     1324:1324:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     1324:1324:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    1325:1325:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    1325:1325:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     1325:1325:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     1325:1325:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveObject16 -> com.android.tools.r8.code.j2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7147,9 +7152,9 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:1323:void com.android.tools.r8.ir.conversion.IRBuilder.addMove(com.android.tools.r8.ir.code.ValueType,int,int):0:1321 -> a
     2:1323:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveObjectFrom16 -> com.android.tools.r8.code.l2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7159,56 +7164,56 @@
     2:1323:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39 -> a
     1324:1324:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
     1324:1324:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    1325:1325:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    1325:1325:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     1325:1325:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     1325:1325:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     1326:1326:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     1326:1326:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    1327:1327:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    1327:1327:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     1327:1327:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
     1327:1327:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveResult -> com.android.tools.r8.code.m2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):14:14 -> <init>
     2:2:void <init>(int):18:18 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):7 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):7 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):38:38 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveResultObject -> com.android.tools.r8.code.n2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveResultWide -> com.android.tools.r8.code.o2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveWide -> com.android.tools.r8.code.q2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7216,20 +7221,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveWide16 -> com.android.tools.r8.code.p2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MoveWideFrom16 -> com.android.tools.r8.code.r2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7237,17 +7242,17 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42:42 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
     4:4:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    5:5:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     5:5:void com.android.tools.r8.code.Format22x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulDouble -> com.android.tools.r8.code.t2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():9:9 -> <clinit>
@@ -7255,9 +7260,9 @@
     2:7:void <init>(int,int,int):20:25 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulDouble2Addr -> com.android.tools.r8.code.s2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7265,12 +7270,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulFloat -> com.android.tools.r8.code.v2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():9:9 -> <clinit>
@@ -7278,9 +7283,9 @@
     2:7:void <init>(int,int,int):20:25 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulFloat2Addr -> com.android.tools.r8.code.u2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7288,12 +7293,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulInt -> com.android.tools.r8.code.x2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():8:8 -> <clinit>
@@ -7301,9 +7306,9 @@
     2:7:void <init>(int,int,int):19:24 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulInt2Addr -> com.android.tools.r8.code.w2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7311,26 +7316,26 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulIntLit16 -> com.android.tools.r8.code.y2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulIntLit8 -> com.android.tools.r8.code.z2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulLong -> com.android.tools.r8.code.B2:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():9:9 -> <clinit>
@@ -7338,9 +7343,9 @@
     2:7:void <init>(int,int,int):20:25 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.MulLong2Addr -> com.android.tools.r8.code.A2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7348,12 +7353,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NegDouble -> com.android.tools.r8.code.C2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7361,12 +7366,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NegFloat -> com.android.tools.r8.code.D2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7374,12 +7379,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NegInt -> com.android.tools.r8.code.E2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7387,12 +7392,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NegLong -> com.android.tools.r8.code.F2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7400,12 +7405,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NewArray -> com.android.tools.r8.code.G2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):24:24 -> <init>
     2:2:void <init>(int,int,com.android.tools.r8.graph.DexType):28:28 -> <init>
@@ -7418,33 +7423,33 @@
     6:6:com.android.tools.r8.graph.DexType getType():62:62 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82 -> a
     7:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):82:83 -> a
-    9:9:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    9:9:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     9:9:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):83 -> a
     10:10:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):84:84 -> a
     11:11:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):67:67 -> a
     12:12:com.android.tools.r8.graph.DexType getType():62:62 -> a
     12:12:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):67 -> a
     13:13:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):67:67 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NewInstance -> com.android.tools.r8.code.H2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):24:24 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexType):28:28 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getType():79:79 -> D
+    1:1:com.android.tools.r8.graph.DexType getType():79:79 -> E
     1:1:int internalCompareBBBB(com.android.tools.r8.code.Format21c):48:48 -> a
     2:3:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:58 -> a
     4:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):68:69 -> a
-    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):69 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):70:70 -> a
     8:8:void registerUse(com.android.tools.r8.graph.UseRegistry):75:75 -> a
     9:9:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):84:84 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Nop -> com.android.tools.r8.code.I2:
     int $r8$clinit -> e
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
@@ -7454,14 +7459,14 @@
     1:1:int internalCompareTo(com.android.tools.r8.code.Instruction):37:37 -> a
     2:2:java.lang.String com.android.tools.r8.code.Format10x.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):42:42 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.Format10x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):32 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format10x.toString(com.android.tools.r8.naming.ClassNameMapper):37:37 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NotInt -> com.android.tools.r8.code.J2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7469,12 +7474,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.NotLong -> com.android.tools.r8.code.K2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7482,20 +7487,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.OrInt -> com.android.tools.r8.code.M2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.OrInt2Addr -> com.android.tools.r8.code.L2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7503,34 +7508,34 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.OrIntLit16 -> com.android.tools.r8.code.N2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.OrIntLit8 -> com.android.tools.r8.code.O2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.OrLong -> com.android.tools.r8.code.Q2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.OrLong2Addr -> com.android.tools.r8.code.P2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7538,12 +7543,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.PackedSwitch -> com.android.tools.r8.code.R2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):17:17 -> <init>
     2:2:void <init>(int):21:21 -> <init>
@@ -7552,9 +7557,9 @@
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):48:49 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):54:54 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.PackedSwitchPayload -> com.android.tools.r8.code.S2:
     int[] targets -> i
     int first_key -> h
@@ -7563,23 +7568,23 @@
     1:1:void <clinit>():17:17 -> <clinit>
     1:6:void <init>(int,com.android.tools.r8.code.BytecodeStream):24:29 -> <init>
     7:11:void <init>(int,int[]):33:37 -> <init>
-    boolean isPayload() -> A
-    1:1:int[] keys():94:94 -> D
-    1:1:int numberOfKeys():84:84 -> E
-    1:1:int[] switchTargetOffsets():89:89 -> F
+    boolean isPayload() -> B
+    1:1:int[] keys():94:94 -> E
+    1:1:int numberOfKeys():84:84 -> F
+    1:1:int[] switchTargetOffsets():89:89 -> G
     1:4:int internalCompareTo(com.android.tools.r8.code.Instruction):62:65 -> a
     5:5:int lambda$internalCompareTo$0(com.android.tools.r8.code.PackedSwitchPayload):62:62 -> a
-    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):52 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53:53 -> a
-    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):53 -> a
     9:11:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):54:56 -> a
     12:21:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):104:113 -> a
-    22:22:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):230:230 -> a
+    22:22:java.lang.String com.android.tools.r8.code.Instruction.formatOffset(int):241:241 -> a
     22:22:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):113 -> a
     23:23:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):115:115 -> a
-    24:24:java.lang.String com.android.tools.r8.code.Instruction.formatDecimalOffset(int):234:234 -> a
+    24:24:java.lang.String com.android.tools.r8.code.Instruction.formatDecimalOffset(int):245:245 -> a
     24:24:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):115 -> a
     25:27:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):117:119 -> a
     28:28:java.lang.String com.android.tools.r8.code.Format10x.toString(com.android.tools.r8.naming.ClassNameMapper):37:37 -> a
@@ -7591,15 +7596,15 @@
     3:17:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):124:138 -> b
     1:1:int[] lambda$internalCompareTo$2(com.android.tools.r8.code.PackedSwitchPayload):64:64 -> c
     1:3:int hashCode():71:73 -> hashCode
-    1:1:int getSize():79:79 -> s
+    1:1:int getSize():79:79 -> t
 com.android.tools.r8.code.RemDouble -> com.android.tools.r8.code.U2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemDouble2Addr -> com.android.tools.r8.code.T2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7607,20 +7612,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemFloat -> com.android.tools.r8.code.W2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemFloat2Addr -> com.android.tools.r8.code.V2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -7628,21 +7633,21 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemInt -> com.android.tools.r8.code.Y2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemInt2Addr -> com.android.tools.r8.code.X2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7650,38 +7655,38 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemIntLit16 -> com.android.tools.r8.code.Z2:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemIntLit8 -> com.android.tools.r8.code.a3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemLong -> com.android.tools.r8.code.c3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RemLong2Addr -> com.android.tools.r8.code.b3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7689,41 +7694,41 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Return -> com.android.tools.r8.code.d3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    1:1:int[] getTargets():39:39 -> u
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    1:1:int[] getTargets():39:39 -> v
 com.android.tools.r8.code.ReturnObject -> com.android.tools.r8.code.e3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    1:1:int[] getTargets():39:39 -> u
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    1:1:int[] getTargets():39:39 -> v
 com.android.tools.r8.code.ReturnVoid -> com.android.tools.r8.code.f3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>():18:18 -> <init>
@@ -7732,173 +7737,173 @@
     2:2:java.lang.String com.android.tools.r8.code.Format10x.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):42:42 -> a
     2:2:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):52:52 -> a
-    4:4:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    4:4:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     4:4:void com.android.tools.r8.code.Format10x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):32 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     1:1:java.lang.String com.android.tools.r8.code.Format10x.toString(com.android.tools.r8.naming.ClassNameMapper):37:37 -> b
     1:1:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper):8 -> b
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    1:1:int[] getTargets():47:47 -> u
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    1:1:int[] getTargets():47:47 -> v
 com.android.tools.r8.code.ReturnWide -> com.android.tools.r8.code.g3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):44:44 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    1:1:int[] getTargets():39:39 -> u
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
+    1:1:int[] getTargets():39:39 -> v
 com.android.tools.r8.code.RsubInt -> com.android.tools.r8.code.h3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.RsubIntLit8 -> com.android.tools.r8.code.i3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.Sget -> com.android.tools.r8.code.j3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SgetBoolean -> com.android.tools.r8.code.k3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SgetByte -> com.android.tools.r8.code.l3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SgetChar -> com.android.tools.r8.code.m3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SgetObject -> com.android.tools.r8.code.n3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SgetOrSput -> com.android.tools.r8.code.o3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.DexField[]):17:17 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):21:21 -> <init>
     1:2:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):30:31 -> a
     3:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
-    5:5:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    5:5:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     5:5:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     7:7:int internalCompareBBBB(com.android.tools.r8.code.Format21c):53:53 -> a
-    1:1:com.android.tools.r8.graph.DexField getField():48:48 -> m
+    1:1:com.android.tools.r8.graph.DexField getField():48:48 -> n
 com.android.tools.r8.code.SgetShort -> com.android.tools.r8.code.p3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SgetWide -> com.android.tools.r8.code.q3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShlInt -> com.android.tools.r8.code.s3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShlInt2Addr -> com.android.tools.r8.code.r3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7906,27 +7911,27 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShlIntLit8 -> com.android.tools.r8.code.t3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShlLong -> com.android.tools.r8.code.v3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShlLong2Addr -> com.android.tools.r8.code.u3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7934,20 +7939,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShrInt -> com.android.tools.r8.code.x3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShrInt2Addr -> com.android.tools.r8.code.w3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7955,27 +7960,27 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShrIntLit8 -> com.android.tools.r8.code.y3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShrLong -> com.android.tools.r8.code.A3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.ShrLong2Addr -> com.android.tools.r8.code.z3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -7983,24 +7988,24 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SparseSwitch -> com.android.tools.r8.code.B3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int):20:20 -> <init>
+    boolean isIntSwitch() -> A
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):45:45 -> a
     2:2:int com.android.tools.r8.code.Format31t.getPayloadOffset():53:53 -> a
     2:2:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):46 -> a
     3:4:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:48 -> a
     5:5:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):53:53 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
-    boolean isIntSwitch() -> z
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SparseSwitchPayload -> com.android.tools.r8.code.C3:
     int[] keys -> h
     int[] targets -> i
@@ -8009,16 +8014,16 @@
     1:1:void <clinit>():17:17 -> <clinit>
     1:10:void <init>(int,com.android.tools.r8.code.BytecodeStream):24:33 -> <init>
     11:15:void <init>(int[],int[]):37:41 -> <init>
-    boolean isPayload() -> A
-    1:1:int[] keys():95:95 -> D
-    1:1:int numberOfKeys():90:90 -> E
-    1:1:int[] switchTargetOffsets():100:100 -> F
+    boolean isPayload() -> B
+    1:1:int[] keys():95:95 -> E
+    1:1:int numberOfKeys():90:90 -> F
+    1:1:int[] switchTargetOffsets():100:100 -> G
     1:4:int internalCompareTo(com.android.tools.r8.code.Instruction):68:71 -> a
     5:5:int lambda$internalCompareTo$0(com.android.tools.r8.code.SparseSwitchPayload):68:68 -> a
-    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    6:6:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     6:6:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):56 -> a
     7:7:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57:57 -> a
-    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):104:104 -> a
+    8:8:void com.android.tools.r8.code.Instruction.write16BitValue(int,java.nio.ShortBuffer):105:105 -> a
     8:8:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):57 -> a
     9:13:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):58:62 -> a
     14:29:java.lang.String toString(com.android.tools.r8.naming.ClassNameMapper,com.android.tools.r8.code.Instruction):110:125 -> a
@@ -8031,127 +8036,127 @@
     3:18:java.lang.String toSmaliString(com.android.tools.r8.code.Instruction):130:145 -> b
     1:1:int[] lambda$internalCompareTo$2(com.android.tools.r8.code.SparseSwitchPayload):70:70 -> c
     1:3:int hashCode():77:79 -> hashCode
-    1:1:int getSize():85:85 -> s
+    1:1:int getSize():85:85 -> t
 com.android.tools.r8.code.Sput -> com.android.tools.r8.code.D3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SputBoolean -> com.android.tools.r8.code.E3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SputByte -> com.android.tools.r8.code.F3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SputChar -> com.android.tools.r8.code.G3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SputObject -> com.android.tools.r8.code.H3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SputShort -> com.android.tools.r8.code.I3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SputWide -> com.android.tools.r8.code.J3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream,com.android.tools.r8.graph.OffsetToObjectMapping):18:18 -> <init>
     2:2:void <init>(int,com.android.tools.r8.graph.DexField):22:22 -> <init>
     1:2:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:42 -> a
     1:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     3:3:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):42 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     4:4:void com.android.tools.r8.code.SgetOrSput.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:43 -> a
     4:4:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):11 -> a
     5:5:void registerUse(com.android.tools.r8.graph.UseRegistry):42:42 -> a
     6:6:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):47:47 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubDouble -> com.android.tools.r8.code.L3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubDouble2Addr -> com.android.tools.r8.code.K3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -8159,20 +8164,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubFloat -> com.android.tools.r8.code.N3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubFloat2Addr -> com.android.tools.r8.code.M3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -8180,20 +8185,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubInt -> com.android.tools.r8.code.P3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubInt2Addr -> com.android.tools.r8.code.O3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -8201,20 +8206,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubLong -> com.android.tools.r8.code.R3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SubLong2Addr -> com.android.tools.r8.code.Q3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -8222,19 +8227,19 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.SwitchPayload -> com.android.tools.r8.code.S3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):11:11 -> <init>
     2:2:void <init>():14:14 -> <init>
-    boolean isSwitchPayload() -> C
-    int[] keys() -> D
-    int numberOfKeys() -> E
-    int[] switchTargetOffsets() -> F
+    boolean isSwitchPayload() -> D
+    int[] keys() -> E
+    int numberOfKeys() -> F
+    int[] switchTargetOffsets() -> G
     void buildIR(com.android.tools.r8.ir.conversion.IRBuilder) -> a
 com.android.tools.r8.code.Throw -> com.android.tools.r8.code.T3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
@@ -8242,22 +8247,22 @@
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37:37 -> a
     1:1:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):88:88 -> a
+    2:2:void com.android.tools.r8.code.Instruction.writeFirst(int,java.nio.ShortBuffer):89:89 -> a
     2:2:void com.android.tools.r8.code.Format11x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):37 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
     3:3:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    boolean canThrow() -> j
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    boolean canThrow() -> k
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.UshrInt -> com.android.tools.r8.code.V3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.UshrInt2Addr -> com.android.tools.r8.code.U3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -8265,27 +8270,27 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.UshrIntLit8 -> com.android.tools.r8.code.W3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.UshrLong -> com.android.tools.r8.code.Y3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int,int):19:19 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.UshrLong2Addr -> com.android.tools.r8.code.X3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -8293,20 +8298,20 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.XorInt -> com.android.tools.r8.code.a4:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.XorInt2Addr -> com.android.tools.r8.code.Z3:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):15:15 -> <init>
     2:2:void <init>(int,int):19:19 -> <init>
@@ -8314,34 +8319,34 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):39:39 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):8 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.XorIntLit16 -> com.android.tools.r8.code.b4:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.XorIntLit8 -> com.android.tools.r8.code.c4:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.XorLong -> com.android.tools.r8.code.e4:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int,int):20:20 -> <init>
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils) -> a
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.code.XorLong2Addr -> com.android.tools.r8.code.d4:
     1:1:void <init>(int,com.android.tools.r8.code.BytecodeStream):16:16 -> <init>
     2:2:void <init>(int,int):20:20 -> <init>
@@ -8349,12 +8354,12 @@
     1:1:void buildIR(com.android.tools.r8.ir.conversion.IRBuilder):40:40 -> a
     2:2:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41:41 -> a
     2:2:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):96:96 -> a
+    3:3:void com.android.tools.r8.code.Instruction.writeFirst(int,int,java.nio.ShortBuffer):97:97 -> a
     3:3:void com.android.tools.r8.code.Format12x.write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):41 -> a
     3:3:void write(java.nio.ShortBuffer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):9 -> a
-    java.lang.String getName() -> o
-    int getOpcode() -> q
-    java.lang.String getSmaliName() -> t
+    java.lang.String getName() -> p
+    int getOpcode() -> r
+    java.lang.String getSmaliName() -> u
 com.android.tools.r8.com.google.common.base.Absent -> com.android.tools.r8.internal.c:
     com.android.tools.r8.com.google.common.base.Absent INSTANCE -> a
     1:1:void <clinit>():29:29 -> <clinit>
@@ -8395,7 +8400,7 @@
     252:252:java.lang.String com.android.tools.r8.com.google.common.base.Strings.repeat(java.lang.String,int):155:155 -> a
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.MoreObjects.firstNonNull(java.lang.Object,java.lang.Object):56 -> b
-com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.W4:
+com.android.tools.r8.com.google.common.base.CharMatcher -> com.android.tools.r8.internal.X4:
     int $r8$clinit -> a
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.whitespace():134:134 -> <clinit>
     1:1:void <clinit>():272 -> <clinit>
@@ -8421,7 +8426,7 @@
     2:2:boolean apply(java.lang.Object):53 -> apply
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher negate():497:497 -> b
     1:1:java.util.function.Predicate negate():53:53 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.K4:
+com.android.tools.r8.com.google.common.base.CharMatcher$Any -> com.android.tools.r8.internal.L4:
     com.android.tools.r8.com.google.common.base.CharMatcher$Any INSTANCE -> c
     1:1:void <clinit>():1119:1119 -> <clinit>
     1:1:void <init>():1122:1122 -> <init>
@@ -8431,27 +8436,27 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.none():117:117 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Any.negate():1209 -> negate
     1:1:java.util.function.Predicate negate():1117 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.internal.L4:
+com.android.tools.r8.com.google.common.base.CharMatcher$Ascii -> com.android.tools.r8.internal.M4:
     com.android.tools.r8.com.google.common.base.CharMatcher$Ascii INSTANCE -> c
     1:1:void <clinit>():1385:1385 -> <clinit>
     1:1:void <init>():1388:1388 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.internal.M4:
+com.android.tools.r8.com.google.common.base.CharMatcher$Digit -> com.android.tools.r8.internal.N4:
     com.android.tools.r8.com.google.common.base.CharMatcher$Digit INSTANCE -> e
     1:1:void <clinit>():1455:1455 -> <clinit>
     1:1:void <init>():1458:1458 -> <init>
     1:3:char[] nines():1448:1450 -> c
     1:1:char[] zeroes():1444:1444 -> d
-com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.internal.N4:
+com.android.tools.r8.com.google.common.base.CharMatcher$Invisible -> com.android.tools.r8.internal.O4:
     com.android.tools.r8.com.google.common.base.CharMatcher$Invisible INSTANCE -> e
     1:1:void <clinit>():1567:1567 -> <clinit>
     1:1:void <init>():1570:1570 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.internal.O4:
+com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl -> com.android.tools.r8.internal.P4:
     com.android.tools.r8.com.google.common.base.CharMatcher$JavaIsoControl INSTANCE -> c
     1:1:void <clinit>():1545:1545 -> <clinit>
     1:1:void <init>():1548:1548 -> <init>
     boolean matches(char) -> a
-com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.P4:
+com.android.tools.r8.com.google.common.base.CharMatcher$NamedFastMatcher -> com.android.tools.r8.internal.Q4:
     java.lang.String description -> b
     1:1:void com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.<init>():1047:1047 -> <init>
     1:1:void <init>(java.lang.String):1065 -> <init>
@@ -8466,7 +8471,7 @@
     1:1:java.util.function.Predicate com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():1047:1047 -> negate
     1:1:java.util.function.Predicate com.android.tools.r8.com.google.common.base.CharMatcher$FastMatcher.negate():0 -> negate
     1:1:java.lang.String toString():1071:1071 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.internal.Q4:
+com.android.tools.r8.com.google.common.base.CharMatcher$Negated -> com.android.tools.r8.internal.R4:
     com.android.tools.r8.com.google.common.base.CharMatcher original -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1594:1595 -> <init>
     1:1:boolean matches(char):1600:1600 -> a
@@ -8477,9 +8482,9 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$Negated.negate():1629:1629 -> negate
     1:1:java.util.function.Predicate negate():1590 -> negate
     1:1:java.lang.String toString():1634:1634 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.R4:
+com.android.tools.r8.com.google.common.base.CharMatcher$NegatedFastMatcher -> com.android.tools.r8.internal.S4:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CharMatcher):1079:1079 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.S4:
+com.android.tools.r8.com.google.common.base.CharMatcher$None -> com.android.tools.r8.internal.T4:
     com.android.tools.r8.com.google.common.base.CharMatcher$None INSTANCE -> c
     1:1:void <clinit>():1216:1216 -> <clinit>
     1:1:void <init>():1219:1219 -> <init>
@@ -8489,7 +8494,7 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.any():108:108 -> negate
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher$None.negate():1312 -> negate
     1:1:java.util.function.Predicate negate():1214 -> negate
-com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.internal.T4:
+com.android.tools.r8.com.google.common.base.CharMatcher$RangesMatcher -> com.android.tools.r8.internal.U4:
     char[] rangeStarts -> c
     char[] rangeEnds -> d
     java.lang.String description -> b
@@ -8501,24 +8506,24 @@
     1:1:com.android.tools.r8.com.google.common.base.CharMatcher com.android.tools.r8.com.google.common.base.CharMatcher.negate():497:497 -> negate
     1:1:java.util.function.Predicate negate():1398 -> negate
     1:1:java.lang.String toString():1430:1430 -> toString
-com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.internal.U4:
+com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth -> com.android.tools.r8.internal.V4:
     com.android.tools.r8.com.google.common.base.CharMatcher$SingleWidth INSTANCE -> e
     1:1:void <clinit>():1577:1577 -> <clinit>
     1:2:void <init>():1582:1583 -> <init>
     3:3:void <init>():1580:1580 -> <init>
-com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.V4:
+com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace -> com.android.tools.r8.internal.W4:
     com.android.tools.r8.com.google.common.base.CharMatcher$Whitespace INSTANCE -> d
     int SHIFT -> c
     1:3:void <clinit>():1326:1328 -> <clinit>
     1:1:void <init>():1331:1331 -> <init>
     1:1:boolean matches(char):1336:1336 -> a
-com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.c5:
+com.android.tools.r8.com.google.common.base.Charsets -> com.android.tools.r8.internal.d5:
     java.nio.charset.Charset UTF_8 -> a
     1:50:void <clinit>():45:94 -> <clinit>
-com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.P6:
+com.android.tools.r8.com.google.common.base.CommonPattern -> com.android.tools.r8.internal.U6:
     1:1:void <init>():25:25 -> <init>
     com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence) -> a
-com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.Z9:
+com.android.tools.r8.com.google.common.base.Equivalence -> com.android.tools.r8.internal.ia:
     1:1:void <init>():41:41 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
@@ -8526,8 +8531,8 @@
     2:2:int hash(java.lang.Object):113:113 -> b
     1:1:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper wrap(java.lang.Object):162:162 -> c
     1:1:boolean test(java.lang.Object,java.lang.Object):78:78 -> test
-com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.Y9:
-com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.Z9$a:
+com.android.tools.r8.com.google.common.base.Equivalence$1 -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.com.google.common.base.Equivalence$Wrapper -> com.android.tools.r8.internal.ia$a:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> a
     java.lang.Object reference -> b
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Equivalence,java.lang.Object,com.android.tools.r8.com.google.common.base.Equivalence$1):183:183 -> <init>
@@ -8538,24 +8543,24 @@
     2:115:int com.android.tools.r8.com.google.common.base.Equivalence.hash(java.lang.Object):0:113 -> hashCode
     2:115:int hashCode():229 -> hashCode
     1:1:java.lang.String toString():238:238 -> toString
-com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.rb:
-com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.Wg:
+com.android.tools.r8.com.google.common.base.Function -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.com.google.common.base.JdkPattern -> com.android.tools.r8.internal.jh:
     java.util.regex.Pattern pattern -> a
     1:2:void <init>(java.util.regex.Pattern):29:30 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.CommonMatcher matcher(java.lang.CharSequence):35:35 -> a
     1:4:boolean equals(java.lang.Object):60:63 -> equals
     1:1:int hashCode():55:55 -> hashCode
     1:1:java.lang.String toString():50:50 -> toString
-com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.Vg:
+com.android.tools.r8.com.google.common.base.JdkPattern$JdkMatcher -> com.android.tools.r8.internal.ih:
     java.util.regex.Matcher matcher -> a
     1:1:void com.android.tools.r8.com.google.common.base.CommonMatcher.<init>():25:25 -> <init>
     1:1:void <init>(java.util.regex.Matcher):69 -> <init>
     2:2:void <init>(java.util.regex.Matcher):70:70 -> <init>
-com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.Nr:
+com.android.tools.r8.com.google.common.base.Optional -> com.android.tools.r8.internal.Zr:
     1:1:void <init>():150:150 -> <init>
     java.lang.Object or(java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.common.base.Optional absent():93:93 -> a
-com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.As:
+com.android.tools.r8.com.google.common.base.Platform -> com.android.tools.r8.internal.Ms:
     com.android.tools.r8.com.google.common.base.PatternCompiler patternCompiler -> b
     java.util.logging.Logger logger -> a
     1:2:void <clinit>():35:36 -> <clinit>
@@ -8570,11 +8575,11 @@
     11:11:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66:66 -> a
     12:110:com.android.tools.r8.com.google.common.base.CommonPattern com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler.compile(java.lang.String):0:98 -> a
     12:110:com.android.tools.r8.com.google.common.base.CommonPattern compilePattern(java.lang.String):66 -> a
-com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.ys:
-com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.zs:
+com.android.tools.r8.com.google.common.base.Platform$1 -> com.android.tools.r8.internal.Ks:
+com.android.tools.r8.com.google.common.base.Platform$JdkPatternCompiler -> com.android.tools.r8.internal.Ls:
     1:1:void <init>():95:95 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.base.Platform$1):95:95 -> <init>
-com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.Hs:
+com.android.tools.r8.com.google.common.base.Preconditions -> com.android.tools.r8.internal.Ts:
     1:1:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.alwaysFalse():62:62 -> a
     2:2:com.android.tools.r8.com.google.common.base.Predicate com.android.tools.r8.com.google.common.base.Predicates.not(com.android.tools.r8.com.google.common.base.Predicate):88:88 -> a
     3:7:com.android.tools.r8.com.google.common.base.Supplier com.android.tools.r8.com.google.common.base.Suppliers.memoize(com.android.tools.r8.com.google.common.base.Supplier):97:101 -> a
@@ -8623,17 +8628,17 @@
     4:4:void checkState(boolean,java.lang.String,int):509:509 -> b
     5:5:int com.android.tools.r8.com.google.common.base.Preconditions.checkPositionIndex(int,int,java.lang.String):1241:1241 -> b
     5:5:int checkPositionIndex(int,int):1223 -> b
-com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.Is:
+com.android.tools.r8.com.google.common.base.Predicate -> com.android.tools.r8.internal.Us:
     1:1:boolean test(java.lang.Object):80:80 -> test
-com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.Ks:
-com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.Ls:
+com.android.tools.r8.com.google.common.base.Predicates$1 -> com.android.tools.r8.internal.Ws:
+com.android.tools.r8.com.google.common.base.Predicates$NotPredicate -> com.android.tools.r8.internal.Xs:
     com.android.tools.r8.com.google.common.base.Predicate predicate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Predicate):341:342 -> <init>
     1:1:boolean apply(java.lang.Object):347:347 -> apply
     1:3:boolean equals(java.lang.Object):357:359 -> equals
     1:1:int hashCode():352:352 -> hashCode
     1:1:java.lang.String toString():366:366 -> toString
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.Qs:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate -> com.android.tools.r8.internal.ct:
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate NOT_NULL -> d
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate ALWAYS_FALSE -> b
     com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate IS_NULL -> c
@@ -8641,15 +8646,15 @@
     1:37:void <clinit>():283:319 -> <clinit>
     1:1:void <init>(java.lang.String,int):281:281 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.base.Predicates$1):281:281 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.Ms:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$1 -> com.android.tools.r8.internal.Ys:
     1:1:void <init>(java.lang.String,int):283:283 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.Ns:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$2 -> com.android.tools.r8.internal.Zs:
     1:1:void <init>(java.lang.String,int):295:295 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.Os:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$3 -> com.android.tools.r8.internal.at:
     1:1:void <init>(java.lang.String,int):307:307 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.Ps:
+com.android.tools.r8.com.google.common.base.Predicates$ObjectPredicate$4 -> com.android.tools.r8.internal.bt:
     1:1:void <init>(java.lang.String,int):319:319 -> <init>
-com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.Rs:
+com.android.tools.r8.com.google.common.base.Predicates$OrPredicate -> com.android.tools.r8.internal.dt:
     java.util.List components -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.com.google.common.base.Predicates$1):415:415 -> <init>
     2:3:void <init>(java.util.List):418:419 -> <init>
@@ -8660,7 +8665,7 @@
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.toStringHelper(java.lang.String,java.lang.Iterable):457:466 -> toString
     2:11:java.lang.String com.android.tools.r8.com.google.common.base.Predicates.access$800(java.lang.String,java.lang.Iterable):43 -> toString
     2:11:java.lang.String toString():450 -> toString
-com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.yy:
+com.android.tools.r8.com.google.common.base.Splitter -> com.android.tools.r8.internal.Ry:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy,boolean,com.android.tools.r8.com.google.common.base.CharMatcher,int):103:103 -> <init>
     1:1:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252:252 -> a
     2:2:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):214:214 -> a
@@ -8677,24 +8682,24 @@
     11:11:void com.android.tools.r8.com.google.common.base.Splitter.<init>(com.android.tools.r8.com.google.common.base.Splitter$Strategy):100:100 -> a
     11:11:com.android.tools.r8.com.google.common.base.Splitter com.android.tools.r8.com.google.common.base.Splitter.on(com.android.tools.r8.com.google.common.base.CommonPattern):218 -> a
     11:11:com.android.tools.r8.com.google.common.base.Splitter onPattern(java.lang.String):252 -> a
-com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.xy:
+com.android.tools.r8.com.google.common.base.Splitter$3 -> com.android.tools.r8.internal.Qy:
     1:1:void <init>(com.android.tools.r8.com.google.common.base.CommonPattern):219:219 -> <init>
-com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Ez:
-com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.Fz:
+com.android.tools.r8.com.google.common.base.Supplier -> com.android.tools.r8.internal.Xz:
+com.android.tools.r8.com.google.common.base.Suppliers$MemoizingSupplier -> com.android.tools.r8.internal.Yz:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):114:115 -> <init>
     1:11:java.lang.Object get():121:131 -> get
     1:1:java.lang.String toString():136:136 -> toString
-com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.Gz:
+com.android.tools.r8.com.google.common.base.Suppliers$NonSerializableMemoizingSupplier -> com.android.tools.r8.internal.Zz:
     com.android.tools.r8.com.google.common.base.Supplier delegate -> a
     java.lang.Object value -> c
     boolean initialized -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.base.Supplier):150:151 -> <init>
     1:13:java.lang.Object get():157:169 -> get
     1:1:java.lang.String toString():174:174 -> toString
-com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.nA:
+com.android.tools.r8.com.google.common.base.Throwables -> com.android.tools.r8.internal.FA:
     java.lang.Object jla -> a
     int $r8$clinit -> b
     1:3:java.lang.Object com.android.tools.r8.com.google.common.base.Throwables.getJLA():482:484 -> <clinit>
@@ -8926,26 +8931,26 @@
     1:2:java.util.Map$Entry firstEntry():1555:1556 -> firstEntry
     1:2:java.util.Map$Entry floorEntry(java.lang.Object):1522:1523 -> floorEntry
     1:1:java.lang.Object floorKey(java.lang.Object):1528:1528 -> floorKey
+    1:1:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap.createKeySet():1598:1598 -> h
+    1:1:java.util.SortedSet createKeySet():1498 -> h
     1:1:java.util.NavigableMap headMap(java.lang.Object,boolean):1629:1629 -> headMap
     2:2:java.util.NavigableMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap.headMap(java.lang.Object,boolean):1629:1629 -> headMap
     2:2:java.util.NavigableMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap.headMap(java.lang.Object):1624 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):1498 -> headMap
     1:2:java.util.Map$Entry higherEntry(java.lang.Object):1544:1545 -> higherEntry
     1:1:java.lang.Object higherKey(java.lang.Object):1550:1550 -> higherKey
-    1:1:java.util.NavigableSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$NavigableAsMap.createKeySet():1598:1598 -> i
-    1:1:java.util.SortedSet createKeySet():1498 -> i
-    1:1:java.util.SortedSet keySet():1498:1498 -> j
-    1:1:java.util.SortedMap sortedMap():1498:1498 -> k
+    1:1:java.util.SortedSet keySet():1498:1498 -> i
+    1:1:java.util.SortedMap sortedMap():1498:1498 -> j
+    1:2:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.keySet():1488:1489 -> k
+    1:2:java.util.NavigableSet keySet():1593 -> k
+    3:3:java.util.NavigableSet keySet():1593:1593 -> k
     1:1:java.util.Set keySet():1498:1498 -> keySet
-    1:2:java.util.SortedSet com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.keySet():1488:1489 -> l
-    1:2:java.util.NavigableSet keySet():1593 -> l
-    3:3:java.util.NavigableSet keySet():1593:1593 -> l
+    1:1:java.util.SortedMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.sortedMap():1449:1449 -> l
+    1:1:java.util.NavigableMap sortedMap():1506 -> l
+    2:2:java.util.NavigableMap sortedMap():1506:1506 -> l
     1:2:java.util.Map$Entry lastEntry():1561:1562 -> lastEntry
     1:2:java.util.Map$Entry lowerEntry(java.lang.Object):1511:1512 -> lowerEntry
     1:1:java.lang.Object lowerKey(java.lang.Object):1517:1517 -> lowerKey
-    1:1:java.util.SortedMap com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap$SortedAsMap.sortedMap():1449:1449 -> m
-    1:1:java.util.NavigableMap sortedMap():1506 -> m
-    2:2:java.util.NavigableMap sortedMap():1506:1506 -> m
     1:1:java.util.NavigableSet navigableKeySet():1603:1603 -> navigableKeySet
     1:1:java.util.Map$Entry pollFirstEntry():1567:1567 -> pollFirstEntry
     1:1:java.util.Map$Entry pollLastEntry():1572:1572 -> pollLastEntry
@@ -8997,10 +9002,10 @@
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.AbstractMapBasedMultimap,java.util.SortedMap):1444:1445 -> <init>
     1:1:java.util.Comparator comparator():1454:1454 -> comparator
     1:1:java.lang.Object firstKey():1459:1459 -> firstKey
+    1:1:java.util.SortedSet createKeySet():1494:1494 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):1469:1469 -> headMap
-    1:1:java.util.SortedSet createKeySet():1494:1494 -> i
-    1:2:java.util.SortedSet keySet():1488:1489 -> j
-    1:1:java.util.SortedMap sortedMap():1449:1449 -> k
+    1:2:java.util.SortedSet keySet():1488:1489 -> i
+    1:1:java.util.SortedMap sortedMap():1449:1449 -> j
     1:1:java.util.Set keySet():1442:1442 -> keySet
     1:1:java.lang.Object lastKey():1464:1464 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):1474:1474 -> subMap
@@ -9377,7 +9382,7 @@
     1:1:java.lang.String toString():65 -> toString
 com.android.tools.r8.com.google.common.collect.BiMap -> com.android.tools.r8.internal.f2:
     java.lang.Object forcePut(java.lang.Object,java.lang.Object) -> a
-    com.android.tools.r8.com.google.common.collect.BiMap inverse() -> f
+    com.android.tools.r8.com.google.common.collect.BiMap inverse() -> e
 com.android.tools.r8.com.google.common.collect.ByFunctionOrdering -> com.android.tools.r8.internal.N2:
     com.android.tools.r8.com.google.common.base.Function function -> a
     com.android.tools.r8.com.google.common.collect.Ordering ordering -> b
@@ -9388,7 +9393,7 @@
     2:2:int com.android.tools.r8.com.google.common.base.Objects.hashCode(java.lang.Object[]):76:76 -> hashCode
     2:2:int hashCode():60 -> hashCode
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.internal.F6:
+com.android.tools.r8.com.google.common.collect.CollectCollectors -> com.android.tools.r8.internal.K6:
     java.util.stream.Collector TO_IMMUTABLE_SET -> a
     1:25:void <clinit>():44:68 -> <clinit>
     1:1:void lambda$toImmutableMap$1(java.util.function.Function,java.util.function.Function,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,java.lang.Object):62:62 -> a
@@ -9398,7 +9403,7 @@
     4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     4:4:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):59 -> a
     5:5:java.util.stream.Collector toImmutableMap(java.util.function.Function,java.util.function.Function):60:60 -> a
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.G6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1 -> com.android.tools.r8.internal.L6:
     java.util.Spliterator val$fromSpliterator -> a
     java.util.function.Function val$function -> b
     1:1:void <init>(java.util.Spliterator,java.util.function.Function):105:105 -> <init>
@@ -9414,7 +9419,7 @@
     3:3:java.util.Spliterator trySplit():121 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.map(java.util.Spliterator,java.util.function.Function):105:105 -> trySplit
     4:4:java.util.Spliterator trySplit():121 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.H6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1FlatMapSpliterator -> com.android.tools.r8.internal.M6:
     long estimatedSize -> d
     java.util.function.Function val$function -> e
     java.util.Spliterator from -> b
@@ -9428,7 +9433,7 @@
     1:6:void forEachRemaining(java.util.function.Consumer):242:247 -> forEachRemaining
     1:9:boolean tryAdvance(java.util.function.Consumer):226:234 -> tryAdvance
     1:16:java.util.Spliterator trySplit():252:267 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.I6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1Splitr -> com.android.tools.r8.internal.N6:
     java.util.function.Predicate val$predicate -> c
     java.lang.Object holder -> a
     java.util.Spliterator val$fromSpliterator -> b
@@ -9444,7 +9449,7 @@
     3:3:java.util.Spliterator trySplit():167 -> trySplit
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> trySplit
     4:4:java.util.Spliterator trySplit():167 -> trySplit
-com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.J6:
+com.android.tools.r8.com.google.common.collect.CollectSpliterators$1WithCharacteristics -> com.android.tools.r8.internal.O6:
     java.util.Comparator val$comparator -> c
     java.util.Spliterator delegate -> a
     int val$extraCharacteristics -> b
@@ -9455,7 +9460,7 @@
     1:4:java.util.Comparator getComparator():87:90 -> getComparator
     1:1:boolean tryAdvance(java.util.function.Consumer):60:60 -> tryAdvance
     1:2:java.util.Spliterator trySplit():71:72 -> trySplit
-com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.internal.M6:
+com.android.tools.r8.com.google.common.collect.Collections2 -> com.android.tools.r8.internal.R6:
     java.util.Spliterator com.android.tools.r8.com.google.common.collect.Streams.lambda$concat$0(java.util.Spliterator) -> a
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkEntryNotNull(java.lang.Object,java.lang.Object):34:34 -> a
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkEntryNotNull(java.lang.Object,java.lang.Object):32:32 -> a
@@ -9495,10 +9500,12 @@
     87:87:boolean com.android.tools.r8.com.google.common.collect.Iterables.addAll(java.util.Collection,java.lang.Iterable):335 -> a
     88:88:boolean com.android.tools.r8.com.google.common.collect.Iterables.addAll(java.util.Collection,java.lang.Iterable):335:335 -> a
     89:89:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    90:90:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> a
-    91:94:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):796:799 -> a
-    91:94:boolean com.android.tools.r8.com.google.common.collect.Iterators.any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):688 -> a
-    91:94:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627 -> a
+    90:90:boolean com.android.tools.r8.com.google.common.collect.Iterables.all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):637:637 -> a
+    91:91:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    91:91:boolean com.android.tools.r8.com.google.common.collect.Iterators.all(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):697 -> a
+    91:91:boolean com.android.tools.r8.com.google.common.collect.Iterables.all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):637 -> a
+    92:94:boolean com.android.tools.r8.com.google.common.collect.Iterators.all(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):698:700 -> a
+    92:94:boolean com.android.tools.r8.com.google.common.collect.Iterables.all(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):637 -> a
     95:95:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.find(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):669:669 -> a
     96:96:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     96:96:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.find(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate,java.lang.Object):743 -> a
@@ -9604,19 +9611,18 @@
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smearedHash(java.lang.Object):54:54 -> b
     2:2:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMapWithExpectedSize(int):300:300 -> b
     3:3:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newConcurrentHashSet():310:310 -> b
-    4:4:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.cycle(java.lang.Iterable):410 -> b
-    5:5:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.cycle(java.lang.Iterable):411:411 -> b
-    6:6:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    6:6:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):573 -> b
-    7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
-    7:7:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):574 -> b
-    8:8:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> b
-    9:12:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.intersection(java.util.Set,java.util.Set):839:842 -> b
-    13:15:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.pollNext(java.util.Iterator):1017:1019 -> b
-    16:16:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> b
-    17:24:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
-    25:25:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
+    4:4:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627:627 -> b
+    5:8:int com.android.tools.r8.com.google.common.collect.Iterators.indexOf(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):796:799 -> b
+    5:8:boolean com.android.tools.r8.com.google.common.collect.Iterators.any(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):688 -> b
+    5:8:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):627 -> b
+    9:9:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
+    9:9:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.cycle(java.lang.Iterable):410 -> b
+    10:10:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.cycle(java.lang.Iterable):411:411 -> b
+    11:14:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.intersection(java.util.Set,java.util.Set):839:842 -> b
+    15:17:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterators.pollNext(java.util.Iterator):1017:1019 -> b
+    18:18:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Iterators.forArray(java.lang.Object[]):1054:1054 -> b
+    19:26:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1123:1130 -> b
+    27:27:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Multisets.spliteratorImpl(com.android.tools.r8.com.google.common.collect.Multiset):1124:1124 -> b
     1:1:int com.android.tools.r8.com.google.common.collect.Hashing.smear(int):50:50 -> c
     2:2:java.util.stream.Stream com.android.tools.r8.com.google.common.collect.Streams.stream(java.util.Iterator):82:82 -> c
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.Iterables.getOnlyElement(java.lang.Iterable):266:266 -> c
@@ -9625,11 +9631,16 @@
     19:19:java.util.HashMap com.android.tools.r8.com.google.common.collect.Maps.newHashMap():283:283 -> c
     20:23:com.android.tools.r8.com.google.common.collect.Sets$SetView com.android.tools.r8.com.google.common.collect.Sets.union(java.util.Set,java.util.Set):741:744 -> c
     24:24:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
-    24:24:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):112 -> c
-    25:25:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114:114 -> c
-    26:29:int com.android.tools.r8.com.google.common.collect.Lists.computeArrayListCapacity(int):122:125 -> c
-    26:29:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114 -> c
-    30:31:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):115:116 -> c
+    24:24:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):573 -> c
+    25:25:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    25:25:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):574 -> c
+    26:26:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.filter(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> c
+    27:27:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> c
+    27:27:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):112 -> c
+    28:28:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114:114 -> c
+    29:32:int com.android.tools.r8.com.google.common.collect.Lists.computeArrayListCapacity(int):122:125 -> c
+    29:32:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):114 -> c
+    33:34:java.util.ArrayList com.android.tools.r8.com.google.common.collect.Lists.newArrayList(java.lang.Object[]):115:116 -> c
     1:1:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> d
     2:2:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet(java.lang.Object[]):235:235 -> d
     3:3:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSetWithExpectedSize(int):253:253 -> d
@@ -9653,14 +9664,14 @@
     4:4:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466 -> f
     5:5:java.util.Set com.android.tools.r8.com.google.common.collect.Sets.newIdentityHashSet():466:466 -> f
     1:1:java.util.LinkedHashSet com.android.tools.r8.com.google.common.collect.Sets.newLinkedHashSet():347:347 -> g
-com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.Q6:
+com.android.tools.r8.com.google.common.collect.ComparatorOrdering -> com.android.tools.r8.internal.V6:
     java.util.Comparator comparator -> a
     1:2:void <init>(java.util.Comparator):31:32 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):37:37 -> compare
     1:3:boolean equals(java.lang.Object):45:47 -> equals
     1:1:int hashCode():54:54 -> hashCode
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.q7:
+com.android.tools.r8.com.google.common.collect.Count -> com.android.tools.r8.internal.v7:
     int value -> a
     1:2:void <init>(int):30:31 -> <init>
     1:1:int get():35:35 -> a
@@ -9671,11 +9682,11 @@
     1:1:boolean equals(java.lang.Object):63:63 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.f9:
+com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap -> com.android.tools.r8.internal.o9:
     com.android.tools.r8.com.google.common.collect.EmptyImmutableListMultimap INSTANCE -> g
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():31:31 -> <init>
-com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.eb:
+com.android.tools.r8.com.google.common.collect.FluentIterable -> com.android.tools.r8.internal.nb:
     com.android.tools.r8.com.google.common.base.Optional iterableDelegate -> a
     1:2:void <init>():117:118 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.FluentIterable concat(java.lang.Iterable,java.lang.Iterable):190:190 -> a
@@ -9693,18 +9704,18 @@
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterators.toString(java.util.Iterator):293:302 -> toString
     3:12:java.lang.String com.android.tools.r8.com.google.common.collect.Iterables.toString(java.lang.Iterable):253 -> toString
     3:12:java.lang.String toString():336 -> toString
-com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.cb:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2 -> com.android.tools.r8.internal.lb:
     java.lang.Iterable[] val$inputs -> b
     1:1:void <init>(java.lang.Iterable[]):261:261 -> <init>
     1:1:java.util.Iterator iterator():264:264 -> iterator
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     2:2:java.util.Iterator iterator():264 -> iterator
-com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.bb:
+com.android.tools.r8.com.google.common.collect.FluentIterable$2$1 -> com.android.tools.r8.internal.kb:
     com.android.tools.r8.com.google.common.collect.FluentIterable$2 this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.FluentIterable$2,int):266:266 -> <init>
     1:1:java.util.Iterator com.android.tools.r8.com.google.common.collect.FluentIterable$2$1.get(int):269:269 -> a
     1:1:java.lang.Object get(int):266 -> a
-com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.db:
+com.android.tools.r8.com.google.common.collect.FluentIterable$3 -> com.android.tools.r8.internal.mb:
     java.lang.Iterable val$inputs -> b
     1:1:void <init>(java.lang.Iterable):294:294 -> <init>
     1:1:java.util.Iterator iterator():297:297 -> iterator
@@ -9714,7 +9725,7 @@
     3:3:java.util.Iterator iterator():297 -> iterator
     4:4:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterators.concat(java.util.Iterator):578:578 -> iterator
     4:4:java.util.Iterator iterator():297 -> iterator
-com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.jb:
+com.android.tools.r8.com.google.common.collect.ForwardingCollection -> com.android.tools.r8.internal.sb:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingObject.<init>():55:55 -> <init>
     1:1:void <init>():55 -> <init>
     java.lang.Object com.android.tools.r8.com.google.common.collect.ForwardingObject.delegate() -> a
@@ -9734,7 +9745,7 @@
     2:2:java.lang.Object[] toArray(java.lang.Object[]):128:128 -> toArray
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():72:72 -> toString
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.ForwardingObject.toString():0 -> toString
-com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.kb:
+com.android.tools.r8.com.google.common.collect.ForwardingSortedSet -> com.android.tools.r8.internal.tb:
     1:1:void com.android.tools.r8.com.google.common.collect.ForwardingSet.<init>():55:55 -> <init>
     1:1:void <init>():62 -> <init>
     java.util.Set com.android.tools.r8.com.google.common.collect.ForwardingSet.delegate() -> c
@@ -9749,7 +9760,7 @@
     1:1:java.lang.Object last():84:84 -> last
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):89:89 -> subSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):94:94 -> tailSet
-com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.Tb:
+com.android.tools.r8.com.google.common.collect.HashBiMap -> com.android.tools.r8.internal.cc:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry firstInKeyInsertionOrder -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry lastInKeyInsertionOrder -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] hashTableVToK -> b
@@ -9795,9 +9806,9 @@
     1:6:void clear():380:385 -> clear
     1:1:boolean containsKey(java.lang.Object):245:245 -> containsKey
     1:1:boolean containsValue(java.lang.Object):250:250 -> containsValue
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():547:547 -> e
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.entrySet():3666:3666 -> entrySet
     1:1:java.util.Set entrySet():57 -> entrySet
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():547:547 -> f
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):524 -> forEach
     2:5:void forEach(java.util.function.BiConsumer):525:528 -> forEach
@@ -9805,19 +9816,19 @@
     1:1:java.lang.Object get(java.lang.Object):256:256 -> get
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.valueOrNull(java.util.Map$Entry):3896:3896 -> get
     2:2:java.lang.Object get(java.lang.Object):256 -> get
-    1:1:java.util.Iterator entryIterator():474:474 -> i
-    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(int):75:75 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():65 -> j
-    1:3:void rehashIfNecessary():341:343 -> k
-    4:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):361:361 -> k
-    4:4:void rehashIfNecessary():345 -> k
-    5:5:void rehashIfNecessary():345:345 -> k
-    6:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):361:361 -> k
-    6:6:void rehashIfNecessary():346 -> k
-    7:14:void rehashIfNecessary():346:353 -> k
-    15:18:void rehashIfNecessary():352:355 -> k
+    1:1:java.util.Iterator entryIterator():474:474 -> h
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap com.android.tools.r8.com.google.common.collect.HashBiMap.create(int):75:75 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.HashBiMap create():65 -> i
+    1:3:void rehashIfNecessary():341:343 -> j
+    4:4:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):361:361 -> j
+    4:4:void rehashIfNecessary():345 -> j
+    5:5:void rehashIfNecessary():345:345 -> j
+    6:6:com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry[] com.android.tools.r8.com.google.common.collect.HashBiMap.createTable(int):361:361 -> j
+    6:6:void rehashIfNecessary():346 -> j
+    7:14:void rehashIfNecessary():346:353 -> j
+    15:18:void rehashIfNecessary():352:355 -> j
+    1:1:java.util.Set values():469:469 -> k
     1:1:java.util.Set keySet():434:434 -> keySet
-    1:1:java.util.Set values():469:469 -> l
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):262:262 -> put
     1:8:java.lang.Object remove(java.lang.Object):367:374 -> remove
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> replaceAll
@@ -9829,19 +9840,19 @@
     1:1:int size():390:390 -> size
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap.values():469:469 -> values
     1:1:java.util.Collection values():57 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Pb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1 -> com.android.tools.r8.internal.Yb:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):474:474 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):477:477 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):474 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.Pb$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$1$MapEntry -> com.android.tools.r8.internal.Yb$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$1 this$1 -> b
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):483:484 -> <init>
     1:1:java.lang.Object getKey():489:489 -> getKey
     1:1:java.lang.Object getValue():494:494 -> getValue
     1:17:java.lang.Object setValue(java.lang.Object):499:515 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.Qb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry -> com.android.tools.r8.internal.Zb:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInKToVBucket -> e
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry nextInVToKBucket -> f
     int valueHash -> d
@@ -9849,7 +9860,7 @@
     int keyHash -> c
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry prevInKeyInsertionOrder -> h
     1:3:void <init>(java.lang.Object,int,java.lang.Object,int):99:101 -> <init>
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.Tb$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse -> com.android.tools.r8.internal.cc$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):550:550 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap,com.android.tools.r8.com.google.common.collect.HashBiMap$1):550:550 -> <init>
@@ -9861,8 +9872,8 @@
     1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():553:553 -> containsKey
     1:1:boolean containsKey(java.lang.Object):568 -> containsKey
     2:2:boolean containsKey(java.lang.Object):568:568 -> containsKey
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():553:553 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():602 -> f
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.forward():553:553 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():602 -> e
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):692 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):693:693 -> forEach
@@ -9870,7 +9881,7 @@
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getKey():39:39 -> get
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps.keyOrNull(java.util.Map$Entry):3891 -> get
     2:2:java.lang.Object get(java.lang.Object):573 -> get
-    1:1:java.util.Iterator entryIterator():645:645 -> i
+    1:1:java.util.Iterator entryIterator():645:645 -> h
     1:1:java.util.Set keySet():607:607 -> keySet
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):579:579 -> put
     1:8:java.lang.Object remove(java.lang.Object):589:596 -> remove
@@ -9890,27 +9901,27 @@
     1:1:java.util.Collection values():550 -> values
     2:2:java.util.Set com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse.values():640:640 -> values
     2:2:java.util.Collection values():550 -> values
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.Rb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 -> com.android.tools.r8.internal.ac:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):645:645 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1.output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):648:648 -> a
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):645 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.Rb$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1$InverseEntry -> com.android.tools.r8.internal.ac$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry delegate -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1 this$2 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$1,com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):654:655 -> <init>
     1:1:java.lang.Object getKey():660:660 -> getKey
     1:1:java.lang.Object getValue():665:665 -> getValue
     1:12:java.lang.Object setValue(java.lang.Object):670:681 -> setValue
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.Tb$a$a:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet -> com.android.tools.r8.internal.cc$a$a:
     com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse this$1 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse):612:613 -> <init>
     1:1:java.util.Iterator iterator():629:629 -> iterator
     1:5:boolean remove(java.lang.Object):618:622 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.Sb:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet$1 -> com.android.tools.r8.internal.bc:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$Inverse$InverseKeySet):629:629 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):632:632 -> a
-com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.Tb$b:
+com.android.tools.r8.com.google.common.collect.HashBiMap$Itr -> com.android.tools.r8.internal.cc$b:
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry next -> a
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> d
     com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry toRemove -> b
@@ -9926,15 +9937,15 @@
     5:5:void remove():423 -> remove
     6:8:void remove():424:426 -> remove
     9:9:void remove():421:421 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.Tb$c:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet -> com.android.tools.r8.internal.cc$c:
     com.android.tools.r8.com.google.common.collect.HashBiMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap):439:440 -> <init>
     1:1:java.util.Iterator iterator():445:445 -> iterator
     1:7:boolean remove(java.lang.Object):455:461 -> remove
-com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.Ub:
+com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet$1 -> com.android.tools.r8.internal.dc:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.HashBiMap$KeySet):445:445 -> <init>
     1:1:java.lang.Object output(com.android.tools.r8.com.google.common.collect.HashBiMap$BiEntry):448:448 -> a
-com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.ac:
+com.android.tools.r8.com.google.common.collect.HashMultiset -> com.android.tools.r8.internal.jc:
     1:1:void <init>():70:70 -> <init>
     1:1:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> add
     1:1:boolean add(java.lang.Object):33 -> add
@@ -9953,26 +9964,26 @@
     1:1:boolean remove(java.lang.Object):33 -> remove
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultiset.toString():248:248 -> toString
     1:1:java.lang.String toString():33 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.zc:
+com.android.tools.r8.com.google.common.collect.ImmutableAsList -> com.android.tools.r8.internal.Lc:
     1:1:void <init>():34:34 -> <init>
     1:1:boolean isPartialView():56:56 -> b
     1:1:boolean contains(java.lang.Object):41:41 -> contains
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection() -> i
     1:1:boolean isEmpty():51:51 -> isEmpty
     1:1:int size():46:46 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Ac:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap -> com.android.tools.r8.internal.Mc:
     1:1:void <init>():341:341 -> <init>
     1:1:java.lang.Object forcePut(java.lang.Object,java.lang.Object):376:376 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.inverse():41:41 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.createValues():363:363 -> l
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():36 -> l
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():358:358 -> s
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():36 -> s
-    com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> t
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap of():66:66 -> u
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap.inverse():41:41 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.createValues():363:363 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():36 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():358:358 -> r
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():36 -> r
+    com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse() -> s
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap of():66:66 -> t
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableBiMap.values():358:358 -> values
     1:1:java.util.Collection values():36 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.Ac$a:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder -> com.android.tools.r8.internal.Mc$a:
     1:1:void <init>():159:159 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap build():153:153 -> a
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableBiMap$Builder.put(java.lang.Object,java.lang.Object):172:172 -> a
@@ -10004,9 +10015,9 @@
     482:482:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():257 -> b
     483:483:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> b
     483:483:com.android.tools.r8.com.google.common.collect.ImmutableBiMap build():255 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.internal.Bc:
+com.android.tools.r8.com.google.common.collect.ImmutableBiMapFauxverideShim -> com.android.tools.r8.internal.Nc:
     1:1:void <init>():32:32 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Ec:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection -> com.android.tools.r8.internal.Qc:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():181:181 -> <clinit>
     1:1:void <init>():168:168 -> <init>
@@ -10038,7 +10049,7 @@
     10:15:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.newArray(java.lang.Object[],int):60 -> toArray
     10:15:java.lang.Object[] toArray(java.lang.Object[]):200 -> toArray
     16:19:java.lang.Object[] toArray(java.lang.Object[]):201:204 -> toArray
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.Cc:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder -> com.android.tools.r8.internal.Oc:
     java.lang.Object[] contents -> a
     int size -> b
     1:4:void <init>(int):459:462 -> <init>
@@ -10054,19 +10065,19 @@
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):480 -> b
     2:3:com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder add(java.lang.Object):481:482 -> b
-com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Dc:
+com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder -> com.android.tools.r8.internal.Pc:
     1:1:void <init>():370:370 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object) -> a
     1:1:int expandedCapacity(int,int):361:361 -> a
     2:2:int expandedCapacity(int,int):356:356 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Gc:
+com.android.tools.r8.com.google.common.collect.ImmutableEntry -> com.android.tools.r8.internal.Sc:
     java.lang.Object value -> b
     java.lang.Object key -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):31:33 -> <init>
     1:1:java.lang.Object getKey():39:39 -> getKey
     1:1:java.lang.Object getValue():45:45 -> getValue
     1:1:java.lang.Object setValue(java.lang.Object):50:50 -> setValue
-com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Hc:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumMap -> com.android.tools.r8.internal.Tc:
     java.util.EnumMap delegate -> e
     1:1:void com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.<init>():445:445 -> <init>
     1:1:void <init>(java.util.EnumMap):51 -> <init>
@@ -10084,24 +10095,24 @@
     1:4:boolean equals(java.lang.Object):86:89 -> equals
     1:1:void forEach(java.util.function.BiConsumer):103:103 -> forEach
     1:1:java.lang.Object get(java.lang.Object):78:78 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():474:474 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():0 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():457:457 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():0 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():474:474 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createEntrySet():0 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():457:457 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createKeySet():0 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():479:479 -> k
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():0 -> k
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.keySet():445:445 -> keySet
     1:1:java.util.Set com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.keySet():0 -> keySet
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():479:479 -> l
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.createValues():0 -> l
-    boolean isPartialView() -> n
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58:58 -> o
-    1:1:java.util.Spliterator keySpliterator():63:63 -> q
+    boolean isPartialView() -> m
+    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():58:58 -> n
+    1:1:java.util.Spliterator keySpliterator():63:63 -> p
+    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> s
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1462:1462 -> s
+    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> s
     1:1:int size():68:68 -> size
-    1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94:94 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntryIterator(java.util.Iterator):1462:1462 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryIterator():94 -> t
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():445:445 -> values
     1:1:java.util.Collection com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap.values():0 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Ic:
+com.android.tools.r8.com.google.common.collect.ImmutableEnumSet -> com.android.tools.r8.internal.Uc:
     java.util.EnumSet delegate -> d
     int hashCode -> e
     1:2:void <init>(java.util.EnumSet):58:59 -> <init>
@@ -10122,7 +10133,7 @@
     1:1:int size():84:84 -> size
     1:1:java.util.Spliterator spliterator():74:74 -> spliterator
     1:1:java.lang.String toString():132:132 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.Nc:
+com.android.tools.r8.com.google.common.collect.ImmutableList -> com.android.tools.r8.internal.Zc:
     int $r8$clinit -> b
     1:1:void <init>():377:377 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableList asList() -> a
@@ -10243,11 +10254,11 @@
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     2:2:java.util.Spliterator spliterator():576 -> spliterator
     1:1:java.util.List subList(int,int):57:57 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Mc:
+com.android.tools.r8.com.google.common.collect.ImmutableList$1 -> com.android.tools.r8.internal.Yc:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList,int,int):393:393 -> <init>
     1:1:java.lang.Object get(int):396:396 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.Nc$a:
+com.android.tools.r8.com.google.common.collect.ImmutableList$Builder -> com.android.tools.r8.internal.Zc$a:
     1:1:void <init>():739:739 -> <init>
     2:2:void <init>(int):744:744 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder com.android.tools.r8.com.google.common.collect.ImmutableList$Builder.add(java.lang.Object):757:757 -> a
@@ -10257,7 +10268,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object[]):787:787 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):809:809 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList$Builder add(java.lang.Object):757:757 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.Oc:
+com.android.tools.r8.com.google.common.collect.ImmutableList$ReverseImmutableList -> com.android.tools.r8.internal.ad:
     com.android.tools.r8.com.google.common.collect.ImmutableList forwardList -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableList):604:605 -> <init>
     1:1:boolean isPartialView():657:657 -> b
@@ -10290,7 +10301,7 @@
     2:2:java.util.ListIterator listIterator(int):601 -> listIterator
     1:1:int size():652:652 -> size
     1:1:java.util.List subList(int,int):601:601 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.Nc$b:
+com.android.tools.r8.com.google.common.collect.ImmutableList$SubList -> com.android.tools.r8.internal.Zc$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList this$0 -> e
     int length -> d
     int offset -> c
@@ -10307,14 +10318,14 @@
     2:2:java.util.ListIterator listIterator(int):457 -> listIterator
     1:1:int size():468:468 -> size
     1:1:java.util.List subList(int,int):457:457 -> subList
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.Qc:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap -> com.android.tools.r8.internal.cd:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):391:391 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):405:405 -> get
     1:1:java.util.Collection get(java.lang.Object):52 -> get
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> get
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableListMultimap.get(java.lang.Object):406 -> get
     2:2:java.util.Collection get(java.lang.Object):52 -> get
-com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.Pc:
+com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder -> com.android.tools.r8.internal.bd:
     1:1:void <init>():237:237 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.put(java.lang.Object,java.lang.Object):168:169 -> a
     1:2:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap$Builder put(java.lang.Object,java.lang.Object):242 -> a
@@ -10350,7 +10361,7 @@
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableMultimap com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder.build():296 -> a
     14:27:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328 -> a
     28:28:com.android.tools.r8.com.google.common.collect.ImmutableListMultimap build():328:328 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.Sc:
+com.android.tools.r8.com.google.common.collect.ImmutableMap -> com.android.tools.r8.internal.ed:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection values -> d
     java.util.Map$Entry[] EMPTY_ENTRY_ARRAY -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> b
@@ -10402,31 +10413,31 @@
     1:3:boolean com.android.tools.r8.com.google.common.collect.Maps.equalsImpl(java.util.Map,java.lang.Object):3804:3806 -> equals
     1:3:boolean equals(java.lang.Object):835 -> equals
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):666:666 -> getOrDefault
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184:184 -> h
+    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():234:234 -> h
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184 -> h
     1:1:int hashCode():842:842 -> hashCode
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184:184 -> i
-    2:2:void com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.<init>():234:234 -> i
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder():184 -> i
+    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> i
     1:1:boolean isEmpty():647:647 -> isEmpty
-    com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet() -> j
-    com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet() -> k
+    com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet() -> j
+    com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues() -> k
     1:1:java.util.Set keySet():60:60 -> keySet
-    com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues() -> l
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():679:680 -> m
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet():679:680 -> l
+    boolean isPartialView() -> m
     1:1:java.lang.Object merge(java.lang.Object,java.lang.Object,java.util.function.BiFunction):582:582 -> merge
-    boolean isPartialView() -> n
-    1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():706:707 -> o
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():694:695 -> p
+    1:2:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator keyIterator():706:707 -> n
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableSet keySet():694:695 -> o
+    1:1:java.util.Spliterator keySpliterator():721:721 -> p
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):495:495 -> put
     1:1:void putAll(java.util.Map):594:594 -> putAll
     1:1:java.lang.Object putIfAbsent(java.lang.Object,java.lang.Object):508:508 -> putIfAbsent
-    1:1:java.util.Spliterator keySpliterator():721:721 -> q
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> r
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap of():113:113 -> q
+    1:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():733:734 -> r
     1:1:java.lang.Object remove(java.lang.Object):618:618 -> remove
     2:2:boolean remove(java.lang.Object,java.lang.Object):630:630 -> remove
     1:1:boolean replace(java.lang.Object,java.lang.Object,java.lang.Object):520:520 -> replace
     2:2:java.lang.Object replace(java.lang.Object,java.lang.Object):532:532 -> replace
     1:1:void replaceAll(java.util.function.BiFunction):606:606 -> replaceAll
-    1:2:com.android.tools.r8.com.google.common.collect.ImmutableCollection values():733:734 -> s
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3815:3815 -> toString
     1:1:java.lang.String toString():851 -> toString
     2:3:java.lang.StringBuilder com.android.tools.r8.com.google.common.collect.Collections2.newStringBuilderForCollection(int):369:370 -> toString
@@ -10435,12 +10446,12 @@
     4:13:java.lang.String com.android.tools.r8.com.google.common.collect.Maps.toStringImpl(java.util.Map):3815:3824 -> toString
     4:13:java.lang.String toString():851 -> toString
     1:1:java.util.Collection values():60:60 -> values
-com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.Rc:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$1 -> com.android.tools.r8.internal.dd:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator val$entryIterator -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.UnmodifiableIterator):707:707 -> <init>
     1:1:boolean hasNext():710:710 -> hasNext
     1:1:java.lang.Object next():715:715 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.Sc$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder -> com.android.tools.r8.internal.ed$a:
     java.util.Map$Entry[] entries -> b
     int size -> c
     java.util.Comparator valueComparator -> a
@@ -10467,28 +10478,28 @@
     496:496:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
     496:496:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):329 -> a
     497:499:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):330:332 -> a
-com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.Tc:
+com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl -> com.android.tools.r8.internal.fd:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap):463:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():471:471 -> c
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.ImmutableMap$IteratorBasedImmutableMap$1EntrySetImpl.iterator():471:471 -> iterator
     1:1:java.util.Iterator iterator():462 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():466:466 -> k
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.Wc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry -> com.android.tools.r8.internal.id:
     1:2:void <init>(java.lang.Object,java.lang.Object):48:49 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket() -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket() -> c
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.Uc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableBiMapEntry -> com.android.tools.r8.internal.gd:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInValueBucket -> d
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):104:105 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInValueBucket():111:111 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.Vc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry -> com.android.tools.r8.internal.hd:
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry nextInKeyBucket -> c
     1:2:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableMapEntry):79:80 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMapEntry getNextInKeyBucket():86:86 -> b
     boolean isReusable() -> d
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.Yc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet -> com.android.tools.r8.internal.kd:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean isPartialView():98:98 -> b
     1:4:boolean contains(java.lang.Object):88:91 -> contains
@@ -10498,7 +10509,7 @@
     1:1:int hashCode():109:109 -> hashCode
     com.android.tools.r8.com.google.common.collect.ImmutableMap map() -> k
     1:1:int size():83:83 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.Xc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapEntrySet$RegularEntrySet -> com.android.tools.r8.internal.jd:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     java.util.Map$Entry[] entries -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Map$Entry[]):43:45 -> <init>
@@ -10513,7 +10524,7 @@
     1:1:java.util.Iterator iterator():39 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():50:50 -> k
     1:1:java.util.Spliterator spliterator():60:60 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.Zc:
+com.android.tools.r8.com.google.common.collect.ImmutableMapKeySet -> com.android.tools.r8.internal.ld:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):39:40 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):71:71 -> a
@@ -10528,7 +10539,7 @@
     1:1:java.util.Iterator iterator():35 -> iterator
     1:1:int size():45:45 -> size
     1:1:java.util.Spliterator spliterator():55:55 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.cd:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues -> com.android.tools.r8.internal.od:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):40:41 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$000(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):37:37 -> a
@@ -10554,19 +10565,19 @@
     1:1:java.util.Iterator iterator():36 -> iterator
     1:1:int size():46:46 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.ad:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$1 -> com.android.tools.r8.internal.md:
     com.android.tools.r8.com.google.common.collect.UnmodifiableIterator entryItr -> a
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues):51:52 -> <init>
     1:1:boolean hasNext():56:56 -> hasNext
     1:1:java.lang.Object next():61:61 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.bd:
+com.android.tools.r8.com.google.common.collect.ImmutableMapValues$2 -> com.android.tools.r8.internal.nd:
     com.android.tools.r8.com.google.common.collect.ImmutableMapValues this$0 -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList val$entryList -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMapValues,com.android.tools.r8.com.google.common.collect.ImmutableList):83:83 -> <init>
     1:1:java.lang.Object get(int):86:86 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():91:91 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.gd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap -> com.android.tools.r8.internal.sd:
     com.android.tools.r8.com.google.common.collect.ImmutableMap map -> e
     int size -> f
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap,int):354:356 -> <init>
@@ -10605,13 +10616,13 @@
     1:1:int size():493:493 -> size
     1:1:java.lang.String com.android.tools.r8.com.google.common.collect.AbstractMultimap.toString():274:274 -> toString
     1:1:java.lang.String toString():67 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.dd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1 -> com.android.tools.r8.internal.pd:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):595:595 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.ed:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Builder -> com.android.tools.r8.internal.qd:
     com.android.tools.r8.com.google.common.collect.Multimap builderMultimap -> a
     1:1:void <init>():156:156 -> <init>
     2:3:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):159:160 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.fd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$EntryCollection -> com.android.tools.r8.internal.rd:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap multimap -> b
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):539:540 -> <init>
     1:1:boolean isPartialView():550:550 -> b
@@ -10624,7 +10635,7 @@
     1:1:int size():555:555 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():555 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.internal.gd$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Itr -> com.android.tools.r8.internal.sd$a:
     java.util.Iterator valueIterator -> c
     java.util.Iterator mapIterator -> a
     java.lang.Object key -> b
@@ -10637,7 +10648,7 @@
     7:7:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):598 -> next
     7:7:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMultimap$1.output(java.lang.Object,java.lang.Object):595 -> next
     7:7:java.lang.Object next():589 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.gd$b:
+com.android.tools.r8.com.google.common.collect.ImmutableMultimap$Keys -> com.android.tools.r8.internal.sd$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMultimap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultimap):642:642 -> <init>
     boolean isPartialView() -> b
@@ -10659,7 +10670,7 @@
     1:1:int size():661:661 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.ImmutableMultimap.size():493:493 -> size
     2:2:int size():661 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.id:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset -> com.android.tools.r8.internal.ud:
     int $r8$clinit -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet entrySet -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
@@ -10687,14 +10698,14 @@
     com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int) -> g
     1:1:int hashCode():345:345 -> hashCode
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.hd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1 -> com.android.tools.r8.internal.td:
     java.util.Iterator val$entryIterator -> c
     java.lang.Object element -> b
     int remaining -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,java.util.Iterator):240:240 -> <init>
     1:1:boolean hasNext():246:246 -> hasNext
     1:7:java.lang.Object next():251:257 -> next
-com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.id$a:
+com.android.tools.r8.com.google.common.collect.ImmutableMultiset$EntrySet -> com.android.tools.r8.internal.ud$a:
     com.android.tools.r8.com.google.common.collect.ImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset):373:373 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMultiset,com.android.tools.r8.com.google.common.collect.ImmutableMultiset$1):373:373 -> <init>
@@ -10704,9 +10715,9 @@
     1:1:java.lang.Object get(int):372 -> get
     1:1:int hashCode():404:404 -> hashCode
     1:1:int size():386:386 -> size
-com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.internal.jd:
+com.android.tools.r8.com.google.common.collect.ImmutableMultisetGwtSerializationDependencies -> com.android.tools.r8.internal.vd:
     1:1:void <init>():40:40 -> <init>
-com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.kd:
+com.android.tools.r8.com.google.common.collect.ImmutableSet -> com.android.tools.r8.internal.wd:
     int $r8$clinit -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList asList -> c
     1:1:void <init>():332:332 -> <init>
@@ -10740,7 +10751,7 @@
     1:1:int hashCode():354:354 -> hashCode
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet of():74:74 -> i
     1:1:java.util.stream.Collector toImmutableSet():65:65 -> j
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.kd$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder -> com.android.tools.r8.internal.wd$a:
     1:1:void <init>():471:471 -> <init>
     2:2:void <init>(int):475:475 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection$Builder add(java.lang.Object):464:464 -> a
@@ -10749,7 +10760,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):522:522 -> b
     3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):490:490 -> c
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.md:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed -> com.android.tools.r8.internal.yd:
     1:1:void <init>():376:376 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():381:381 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList createAsList():400:400 -> e
@@ -10759,13 +10770,13 @@
     1:1:java.util.Spliterator spliterator():386:386 -> spliterator
     2:2:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.indexed(int,int,java.util.function.IntFunction):40:40 -> spliterator
     2:2:java.util.Spliterator spliterator():386 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.ld:
+com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1 -> com.android.tools.r8.internal.xd:
     com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed this$0 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed):400:400 -> <init>
     1:1:java.lang.Object get(int):403:403 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed com.android.tools.r8.com.google.common.collect.ImmutableSet$Indexed$1.delegateCollection():408:408 -> i
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():400 -> i
-com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.nd:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList -> com.android.tools.r8.internal.zd:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableSortedSet,com.android.tools.r8.com.google.common.collect.ImmutableList):34:34 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedAsList.delegateCollection():39:39 -> comparator
     1:1:java.util.Comparator comparator():44 -> comparator
@@ -10785,34 +10796,21 @@
     1:1:java.util.Spliterator spliterator():90 -> spliterator
     2:3:java.util.Spliterator spliterator():92:93 -> spliterator
     4:4:java.util.Spliterator spliterator():89:89 -> spliterator
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.internal.od:
-    com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> e
-    java.util.Comparator comparator -> d
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet -> com.android.tools.r8.internal.Ad:
+    com.android.tools.r8.com.google.common.collect.ImmutableSortedSet descendingSet -> f
+    int $r8$clinit -> d
+    java.util.Comparator comparator -> e
     1:2:void <init>(java.util.Comparator):564:565 -> <init>
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet headSetImpl(java.lang.Object,boolean) -> a
     1:4:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):86:89 -> a
     5:5:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> a
     5:5:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):89 -> a
     6:6:com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet emptySet(java.util.Comparator):89:89 -> a
-    7:7:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):390:390 -> a
-    8:8:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> a
-    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):392 -> a
-    9:20:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet construct(java.util.Comparator,int,java.lang.Object[]):393:404 -> a
-    21:21:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    21:21:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.copyOf(java.util.Comparator,java.lang.Iterable):310 -> a
-    21:21:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    22:27:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.copyOf(java.util.Comparator,java.lang.Iterable):311:316 -> a
-    22:27:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    28:28:java.lang.Object[] com.android.tools.r8.com.google.common.collect.Iterables.toArray(java.lang.Iterable):309:309 -> a
-    28:28:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.copyOf(java.util.Comparator,java.lang.Iterable):321 -> a
-    28:28:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    29:29:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.copyOf(java.util.Comparator,java.lang.Iterable):322:322 -> a
-    29:29:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet copyOf(java.util.Comparator,java.util.Collection):345 -> a
-    30:30:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    30:30:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):633 -> a
-    31:31:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
-    31:31:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):634 -> a
-    32:33:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):635:636 -> a
+    7:7:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    7:7:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):633 -> a
+    8:8:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    8:8:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):634 -> a
+    9:10:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):635:636 -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet subSetImpl(java.lang.Object,boolean,java.lang.Object,boolean) -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSortedSet tailSetImpl(java.lang.Object,boolean) -> b
     1:1:java.util.Comparator comparator():577:577 -> comparator
@@ -10848,7 +10846,7 @@
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.tailSet(java.lang.Object,boolean):661:661 -> tailSet
     4:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.tailSet(java.lang.Object):652 -> tailSet
     4:4:java.util.SortedSet tailSet(java.lang.Object):63 -> tailSet
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.internal.od$a:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder -> com.android.tools.r8.internal.Ad$a:
     java.util.Comparator comparator -> c
     1:2:void <init>(java.util.Comparator):462:463 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet build():455:455 -> a
@@ -10861,23 +10859,31 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.addAll(java.lang.Iterable):522:522 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder.addAll(java.lang.Iterable):509 -> b
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder addAll(java.lang.Iterable):455 -> b
-    3:5:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():542:544 -> b
-    6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> b
-    6:6:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder.combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):531 -> b
-    6:6:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):455 -> b
+    3:4:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():542:543 -> b
+    5:395:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.construct(java.util.Comparator,int,java.lang.Object[]):0:390 -> b
+    5:395:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():543 -> b
+    396:396:java.lang.Object[] com.android.tools.r8.com.google.common.collect.ObjectArrays.checkElementsNotNull(java.lang.Object[],int):225:225 -> b
+    396:396:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.construct(java.util.Comparator,int,java.lang.Object[]):392 -> b
+    396:396:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():543 -> b
+    397:408:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet com.android.tools.r8.com.google.common.collect.ImmutableSortedSet.construct(java.util.Comparator,int,java.lang.Object[]):393:404 -> b
+    397:408:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():543 -> b
+    409:409:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet build():544:544 -> b
+    410:410:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):545:545 -> b
+    410:410:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder.combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):531 -> b
+    410:410:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder combine(com.android.tools.r8.com.google.common.collect.ImmutableCollection$ArrayBasedBuilder):455 -> b
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.add(java.lang.Object):490:490 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder.add(java.lang.Object):479 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder add(java.lang.Object):455 -> c
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder.add(java.lang.Object):490:490 -> d
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet$Builder add(java.lang.Object):479 -> d
-com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.internal.pd:
+com.android.tools.r8.com.google.common.collect.ImmutableSortedSetFauxverideShim -> com.android.tools.r8.internal.Bd:
     1:1:void <init>():39:39 -> <init>
-com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Eg:
+com.android.tools.r8.com.google.common.collect.Iterables$10 -> com.android.tools.r8.internal.Rg:
     1:1:void <init>():1061:1061 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):1061:1061 -> apply
     2:2:java.util.Iterator com.android.tools.r8.com.google.common.collect.Iterables$10.apply(java.lang.Iterable):1064:1064 -> apply
     2:2:java.lang.Object apply(java.lang.Object):1061 -> apply
-com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Fg:
+com.android.tools.r8.com.google.common.collect.Iterables$4 -> com.android.tools.r8.internal.Sg:
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> c
     java.lang.Iterable val$unfiltered -> b
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):575:575 -> <init>
@@ -10903,7 +10909,7 @@
     3:3:java.util.Spliterator spliterator():594 -> spliterator
     4:4:java.util.Spliterator com.android.tools.r8.com.google.common.collect.CollectSpliterators.filter(java.util.Spliterator,java.util.function.Predicate):189:189 -> spliterator
     4:4:java.util.Spliterator spliterator():594 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Gg:
+com.android.tools.r8.com.google.common.collect.Iterables$5 -> com.android.tools.r8.internal.Tg:
     java.lang.Iterable val$fromIterable -> b
     com.android.tools.r8.com.google.common.base.Function val$function -> c
     1:1:void <init>(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Function):722:722 -> <init>
@@ -10913,35 +10919,35 @@
     2:2:void forEach(java.util.function.Consumer):731:731 -> forEach
     1:1:java.util.Iterator iterator():725:725 -> iterator
     1:1:java.util.Spliterator spliterator():736:736 -> spliterator
-com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Jg:
+com.android.tools.r8.com.google.common.collect.Iterators$1 -> com.android.tools.r8.internal.Wg:
     java.util.Iterator val$iterator -> a
     1:1:void <init>(java.util.Iterator):137:137 -> <init>
     1:1:boolean hasNext():140:140 -> hasNext
     1:1:java.lang.Object next():145:145 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Kg:
+com.android.tools.r8.com.google.common.collect.Iterators$2 -> com.android.tools.r8.internal.Xg:
     java.util.Iterator iterator -> a
     java.lang.Iterable val$iterable -> b
     1:2:void <init>(java.lang.Iterable):411:412 -> <init>
     1:1:boolean hasNext():425:425 -> hasNext
     1:7:java.lang.Object next():430:436 -> next
     1:1:void remove():441:441 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Lg:
+com.android.tools.r8.com.google.common.collect.Iterators$3 -> com.android.tools.r8.internal.Yg:
     java.lang.Object[] val$elements -> b
     int index -> a
     1:2:void <init>(java.lang.Object[]):471:472 -> <init>
     1:1:boolean hasNext():476:476 -> hasNext
     1:6:java.lang.Object next():481:486 -> next
     7:7:java.lang.Object next():482:482 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Mg:
+com.android.tools.r8.com.google.common.collect.Iterators$5 -> com.android.tools.r8.internal.Zg:
     java.util.Iterator val$unfiltered -> c
     com.android.tools.r8.com.google.common.base.Predicate val$retainIfTrue -> d
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Predicate):659:659 -> <init>
     1:7:java.lang.Object computeNext():662:668 -> l
-com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.Ng:
+com.android.tools.r8.com.google.common.collect.Iterators$6 -> com.android.tools.r8.internal.ah:
     com.android.tools.r8.com.google.common.base.Function val$function -> b
     1:1:void <init>(java.util.Iterator,com.android.tools.r8.com.google.common.base.Function):817:817 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):820:820 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.Og:
+com.android.tools.r8.com.google.common.collect.Iterators$7 -> com.android.tools.r8.internal.bh:
     java.util.Iterator val$iterator -> c
     int val$limitSize -> b
     int count -> a
@@ -10950,21 +10956,21 @@
     1:5:java.lang.Object next():962:966 -> next
     6:6:java.lang.Object next():963:963 -> next
     1:1:void remove():971:971 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.Pg:
+com.android.tools.r8.com.google.common.collect.Iterators$9 -> com.android.tools.r8.internal.ch:
     java.lang.Object val$value -> b
     boolean done -> a
     1:1:void <init>(java.lang.Object):1104:1104 -> <init>
     1:1:boolean hasNext():1109:1109 -> hasNext
     1:5:java.lang.Object next():1114:1118 -> next
     6:6:java.lang.Object next():1115:1115 -> next
-com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.Qg:
+com.android.tools.r8.com.google.common.collect.Iterators$ArrayItr -> com.android.tools.r8.internal.dh:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator EMPTY -> c
     int offset -> e
     1:1:void <clinit>():1058:1058 -> <clinit>
     1:3:void <init>(java.lang.Object[],int,int,int):1065:1067 -> <init>
     1:1:java.lang.Object get(int):1072:1072 -> a
-com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.Rg:
+com.android.tools.r8.com.google.common.collect.Iterators$ConcatenatedIterator -> com.android.tools.r8.internal.eh:
     java.util.Deque metaIterators -> d
     java.util.Iterator topMetaIterator -> c
     java.util.Iterator iterator -> b
@@ -10984,17 +10990,17 @@
     2:2:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     2:2:void remove():1433 -> remove
     3:4:void remove():1434:1435 -> remove
-com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.Sg:
+com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator -> com.android.tools.r8.internal.fh:
     com.android.tools.r8.com.google.common.collect.Iterators$EmptyModifiableIterator INSTANCE -> a
     1:1:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):97:97 -> <init>
     1:1:java.lang.Object next():107:107 -> next
     1:1:void com.android.tools.r8.com.google.common.collect.CollectPreconditions.checkRemove(boolean):65:65 -> remove
     1:1:void remove():112 -> remove
-com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.Em:
-com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.Gm:
+com.android.tools.r8.com.google.common.collect.ListMultimap -> com.android.tools.r8.internal.Rm:
+com.android.tools.r8.com.google.common.collect.Lists$RandomAccessReverseList -> com.android.tools.r8.internal.Tm:
     1:1:void <init>(java.util.List):991:991 -> <init>
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.Im:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList -> com.android.tools.r8.internal.Vm:
     java.util.List forwardList -> a
     1:2:void <init>(java.util.List):854:855 -> <init>
     1:1:java.util.List getForwardList():859:859 -> a
@@ -11055,7 +11061,7 @@
     7:7:int com.android.tools.r8.com.google.common.collect.Lists$ReverseList.reversePosition(int):870:870 -> subList
     7:7:java.util.List subList(int,int):912 -> subList
     8:8:java.util.List subList(int,int):912:912 -> subList
-com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.Hm:
+com.android.tools.r8.com.google.common.collect.Lists$ReverseList$1 -> com.android.tools.r8.internal.Um:
     com.android.tools.r8.com.google.common.collect.Lists$ReverseList this$0 -> c
     java.util.ListIterator val$forwardIterator -> b
     boolean canRemoveOrSet -> a
@@ -11078,13 +11084,13 @@
     2:2:void remove():975 -> remove
     3:4:void remove():976:977 -> remove
     1:2:void set(java.lang.Object):982:983 -> set
-com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.Cn:
-com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.Dn:
+com.android.tools.r8.com.google.common.collect.Maps$1 -> com.android.tools.r8.internal.On:
+com.android.tools.r8.com.google.common.collect.Maps$5 -> com.android.tools.r8.internal.Pn:
     java.util.Map$Entry val$entry -> a
     1:1:void <init>(java.util.Map$Entry):1447:1447 -> <init>
     1:1:java.lang.Object getKey():1450:1450 -> getKey
     1:1:java.lang.Object getValue():1455:1455 -> getValue
-com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.En:
+com.android.tools.r8.com.google.common.collect.Maps$6 -> com.android.tools.r8.internal.Qn:
     java.util.Iterator val$entryIterator -> a
     1:1:void <init>(java.util.Iterator):1462:1462 -> <init>
     1:1:boolean hasNext():1465:1465 -> hasNext
@@ -11097,23 +11103,23 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.unmodifiableEntry(java.util.Map$Entry):1447:1447 -> next
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps$6.next():1470 -> next
     3:3:java.lang.Object next():1462 -> next
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.Hn:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction -> com.android.tools.r8.internal.Tn:
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction VALUE -> b
     com.android.tools.r8.com.google.common.collect.Maps$EntryFunction KEY -> a
     1:8:void <clinit>():93:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):92:92 -> <init>
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.com.google.common.collect.Maps$1):92:92 -> <init>
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.Fn:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1 -> com.android.tools.r8.internal.Rn:
     1:1:void <init>(java.lang.String,int):93:93 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):93:93 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$1.apply(java.util.Map$Entry):97:97 -> apply
     2:2:java.lang.Object apply(java.lang.Object):93 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.Gn:
+com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2 -> com.android.tools.r8.internal.Sn:
     1:1:void <init>(java.lang.String,int):100:100 -> <init>
     1:1:java.lang.Object apply(java.lang.Object):100:100 -> apply
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Maps$EntryFunction$2.apply(java.util.Map$Entry):104:104 -> apply
     2:2:java.lang.Object apply(java.lang.Object):100 -> apply
-com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.In:
+com.android.tools.r8.com.google.common.collect.Maps$EntrySet -> com.android.tools.r8.internal.Un:
     1:1:void <init>():4112:4112 -> <init>
     java.util.Map map() -> a
     1:1:void clear():4122:4122 -> clear
@@ -11132,11 +11138,11 @@
     6:6:boolean retainAll(java.util.Collection):4166 -> retainAll
     7:13:boolean retainAll(java.util.Collection):4167:4173 -> retainAll
     1:1:int size():4117:4117 -> size
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.Kn:
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap -> com.android.tools.r8.internal.Wn:
     1:1:void <init>():3653:3653 -> <init>
     1:1:java.util.Set entrySet():3666:3666 -> entrySet
-    java.util.Iterator entryIterator() -> i
-com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.Jn:
+    java.util.Iterator entryIterator() -> h
+com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap$1 -> com.android.tools.r8.internal.Vn:
     com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap):3666:3666 -> <init>
     1:1:java.util.Map map():3669:3669 -> a
@@ -11149,7 +11155,7 @@
     2:2:java.util.Spliterator spliterator():3679 -> spliterator
     3:3:java.util.Spliterator com.android.tools.r8.com.google.common.collect.Maps$IteratorBasedAbstractMap.entrySpliterator():3660:3660 -> spliterator
     3:3:java.util.Spliterator spliterator():3679 -> spliterator
-com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.Ln:
+com.android.tools.r8.com.google.common.collect.Maps$KeySet -> com.android.tools.r8.internal.Xn:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):3839:3840 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):3856:3856 -> a
@@ -11184,7 +11190,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$KeySet.map():3844:3844 -> size
     1:1:int size():3861 -> size
     2:2:int size():3861:3861 -> size
-com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.Mn:
+com.android.tools.r8.com.google.common.collect.Maps$Values -> com.android.tools.r8.internal.Yn:
     java.util.Map map -> a
     1:2:void <init>(java.util.Map):4026:4027 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.lang.Object,java.lang.Object):4043:4043 -> a
@@ -11240,7 +11246,7 @@
     1:1:java.util.Map com.android.tools.r8.com.google.common.collect.Maps$Values.map():4031:4031 -> size
     1:1:int size():4093 -> size
     2:2:int size():4093:4093 -> size
-com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.Nn:
+com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap -> com.android.tools.r8.internal.Zn:
     java.util.Collection values -> b
     java.util.Set entrySet -> a
     1:1:void <init>():3612:3612 -> <init>
@@ -11252,31 +11258,31 @@
     2:2:java.util.Collection com.android.tools.r8.com.google.common.collect.Maps$ViewCachingAbstractMap.createValues():3649:3649 -> values
     2:2:java.util.Collection values():3645 -> values
     3:3:java.util.Collection values():3645:3645 -> values
-com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.Zo:
+com.android.tools.r8.com.google.common.collect.Multimap -> com.android.tools.r8.internal.lp:
     boolean containsEntry(java.lang.Object,java.lang.Object) -> a
     java.util.Collection entries() -> a
     java.util.Map asMap() -> b
     com.android.tools.r8.com.google.common.collect.Multiset keys() -> c
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.ap:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$2 -> com.android.tools.r8.internal.mp:
     int val$expectedKeys -> a
     1:1:void <init>(int):127:127 -> <init>
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.bp:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier -> com.android.tools.r8.internal.np:
     int expectedValuesPerKey -> a
     1:2:void <init>(int):193:194 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.MultimapBuilder$ArrayListSupplier.get():199:199 -> get
     1:1:java.lang.Object get():190 -> get
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.cp:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder -> com.android.tools.r8.internal.op:
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>():77:77 -> <init>
     1:1:void com.android.tools.r8.com.google.common.collect.MultimapBuilder.<init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$1):71 -> <init>
     1:1:void <init>():438 -> <init>
     com.android.tools.r8.com.google.common.collect.ListMultimap build() -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys(int):126:127 -> b
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys com.android.tools.r8.com.google.common.collect.MultimapBuilder.linkedHashKeys():113 -> b
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.ep:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys -> com.android.tools.r8.internal.qp:
     1:1:void <init>():282:282 -> <init>
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys.arrayListValues(int):300:301 -> a
     1:2:com.android.tools.r8.com.google.common.collect.MultimapBuilder$ListMultimapBuilder arrayListValues():290 -> a
-com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.dp:
+com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys$1 -> com.android.tools.r8.internal.pp:
     com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys this$0 -> b
     int val$expectedValuesPerKey -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.MultimapBuilder$MultimapBuilderWithKeys,int):301:301 -> <init>
@@ -11289,12 +11295,12 @@
     5:5:com.android.tools.r8.com.google.common.collect.ListMultimap build():305:305 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap com.android.tools.r8.com.google.common.collect.Multimaps.newListMultimap(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):294:294 -> a
     6:6:com.android.tools.r8.com.google.common.collect.ListMultimap build():304 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.fp:
+com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap -> com.android.tools.r8.internal.rp:
     com.android.tools.r8.com.google.common.base.Supplier factory -> g
     1:2:void <init>(java.util.Map,com.android.tools.r8.com.google.common.base.Supplier):301:302 -> <init>
     1:1:java.util.List com.android.tools.r8.com.google.common.collect.Multimaps$CustomListMultimap.createCollection():307:307 -> j
     1:1:java.util.Collection createCollection():297 -> j
-com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.internal.gp:
+com.android.tools.r8.com.google.common.collect.Multimaps$Entries -> com.android.tools.r8.internal.sp:
     1:1:void <init>():1793:1793 -> <init>
     1:1:void clear():1821:1821 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> clear
@@ -11312,7 +11318,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multimap com.android.tools.r8.com.google.common.collect.AbstractMultimap$Entries.multimap():130:130 -> size
     2:2:int size():1798 -> size
     3:3:int size():1798:1798 -> size
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.jp:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys -> com.android.tools.r8.internal.vp:
     com.android.tools.r8.com.google.common.collect.Multimap multimap -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multimap):1645:1646 -> <init>
     1:1:void lambda$forEach$0(java.util.function.Consumer,java.util.Map$Entry):1678:1678 -> a
@@ -11334,17 +11340,17 @@
     3:3:java.util.Iterator com.android.tools.r8.com.google.common.collect.Maps.keyIterator(java.util.Iterator):120 -> iterator
     3:3:java.util.Iterator iterator():1744 -> iterator
     1:1:java.util.Spliterator spliterator():1672:1672 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.ip:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1 -> com.android.tools.r8.internal.up:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys,java.util.Iterator):1652:1652 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1652:1652 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Multiset$Entry com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1.transform(java.util.Map$Entry):1655:1655 -> a
     2:2:java.lang.Object transform(java.lang.Object):1652 -> a
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.hp:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1$1 -> com.android.tools.r8.internal.tp:
     java.util.Map$Entry val$backingEntry -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys$1,java.util.Map$Entry):1655:1655 -> <init>
     1:1:int getCount():1663:1663 -> a
     1:1:java.lang.Object getElement():1658:1658 -> b
-com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.jp$a:
+com.android.tools.r8.com.google.common.collect.Multimaps$Keys$KeysEntrySet -> com.android.tools.r8.internal.vp$a:
     com.android.tools.r8.com.google.common.collect.Multimaps$Keys this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multimaps$Keys):1692:1692 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multiset multiset():1695:1695 -> a
@@ -11357,7 +11363,7 @@
     1:1:int size():1705:1705 -> size
     2:2:int com.android.tools.r8.com.google.common.collect.Multimaps$Keys.distinctElements():1683:1683 -> size
     2:2:int size():1705 -> size
-com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.kp:
+com.android.tools.r8.com.google.common.collect.Multiset -> com.android.tools.r8.internal.wp:
     int remove(java.lang.Object,int) -> a
     boolean setCount(java.lang.Object,int,int) -> a
     1:1:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.collect.Multiset$Entry):321:321 -> a
@@ -11373,22 +11379,22 @@
     2:3:void forEach(java.util.function.Consumer):491:492 -> forEach
     java.util.Set elementSet() -> g
     1:1:java.util.Spliterator spliterator():504:504 -> spliterator
-com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.kp$a:
+com.android.tools.r8.com.google.common.collect.Multiset$Entry -> com.android.tools.r8.internal.wp$a:
     int getCount() -> a
     java.lang.Object getElement() -> b
-com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.lp:
+com.android.tools.r8.com.google.common.collect.Multisets$AbstractEntry -> com.android.tools.r8.internal.xp:
     1:1:void <init>():833:833 -> <init>
     1:4:boolean equals(java.lang.Object):840:843 -> equals
     1:2:int hashCode():854:855 -> hashCode
     1:3:java.lang.String toString():867:869 -> toString
-com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.mp:
+com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount -> com.android.tools.r8.internal.yp:
     com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount INSTANCE -> a
     1:1:void <clinit>():1165:1165 -> <clinit>
     1:1:void <init>():1164:1164 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1164:1164 -> compare
     2:2:int com.android.tools.r8.com.google.common.collect.Multisets$DecreasingCount.compare(com.android.tools.r8.com.google.common.collect.Multiset$Entry,com.android.tools.r8.com.google.common.collect.Multiset$Entry):1168:1168 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1164 -> compare
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.internal.op:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet -> com.android.tools.r8.internal.Ap:
     1:1:void <init>():977:977 -> <init>
     1:1:void clear():982:982 -> clear
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> clear
@@ -11418,25 +11424,25 @@
     2:2:com.android.tools.r8.com.google.common.collect.Multiset com.android.tools.r8.com.google.common.collect.AbstractMultiset$ElementSet.multiset():174:174 -> size
     2:2:int size():1017 -> size
     3:3:int size():1017:1017 -> size
-com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.np:
+com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1 -> com.android.tools.r8.internal.zp:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Multisets$ElementSet,java.util.Iterator):1002:1002 -> <init>
     1:1:java.lang.Object transform(java.lang.Object):1002:1002 -> a
     2:2:java.lang.Object com.android.tools.r8.com.google.common.collect.Multisets$ElementSet$1.transform(com.android.tools.r8.com.google.common.collect.Multiset$Entry):1005:1005 -> a
     2:2:java.lang.Object transform(java.lang.Object):1002 -> a
-com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.pp:
+com.android.tools.r8.com.google.common.collect.Multisets$EntrySet -> com.android.tools.r8.internal.Bp:
     1:1:void <init>():1021:1021 -> <init>
     com.android.tools.r8.com.google.common.collect.Multiset multiset() -> a
     1:1:void clear():1061:1061 -> clear
     1:11:boolean contains(java.lang.Object):1026:1036 -> contains
     1:9:boolean remove(java.lang.Object):1045:1053 -> remove
-com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.qp:
+com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry -> com.android.tools.r8.internal.Cp:
     java.lang.Object element -> a
     int count -> b
     1:4:void <init>(java.lang.Object,int):258:261 -> <init>
     1:1:int getCount():272:272 -> a
     1:1:java.lang.Object getElement():267:267 -> b
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket() -> c
-com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.xp:
+com.android.tools.r8.com.google.common.collect.NaturalOrdering -> com.android.tools.r8.internal.Jp:
     com.android.tools.r8.com.google.common.collect.NaturalOrdering INSTANCE -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:1:void <init>():73:73 -> <init>
@@ -11449,11 +11455,11 @@
     3:3:int compare(java.lang.Object,java.lang.Object):25 -> compare
     4:4:int com.android.tools.r8.com.google.common.collect.NaturalOrdering.compare(java.lang.Comparable,java.lang.Comparable):37:37 -> compare
     4:4:int compare(java.lang.Object,java.lang.Object):25 -> compare
-com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.Rr:
+com.android.tools.r8.com.google.common.collect.Ordering -> com.android.tools.r8.internal.ds:
     1:1:void <init>():390:390 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Ordering natural():161:161 -> a
     2:2:com.android.tools.r8.com.google.common.collect.Ordering from(java.util.Comparator):181:181 -> a
-com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.Cw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableAsList -> com.android.tools.r8.internal.Vw:
     com.android.tools.r8.com.google.common.collect.ImmutableCollection delegate -> c
     com.android.tools.r8.com.google.common.collect.ImmutableList delegateList -> d
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableCollection,com.android.tools.r8.com.google.common.collect.ImmutableList):35:37 -> <init>
@@ -11465,7 +11471,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableList delegateList():50:50 -> j
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator com.android.tools.r8.com.google.common.collect.RegularImmutableAsList.listIterator(int):56:56 -> listIterator
     1:1:java.util.ListIterator listIterator(int):29 -> listIterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.Fw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap -> com.android.tools.r8.internal.Yw:
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> k
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] keyTable -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] valueTable -> g
@@ -11511,25 +11517,25 @@
     2:3:void forEach(java.util.function.BiConsumer):157:158 -> forEach
     1:1:java.lang.Object get(java.lang.Object):139:139 -> get
     1:1:int hashCode():169:169 -> hashCode
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144:144 -> j
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> j
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> j
-    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():151:151 -> k
-    boolean isPartialView() -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():144:144 -> i
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of():74:74 -> i
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145 -> i
+    3:3:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():145:145 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():151:151 -> j
+    boolean isPartialView() -> m
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():188:188 -> s
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> s
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():189 -> s
+    3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():191:192 -> s
     1:1:int size():179:179 -> size
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():188:188 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.ImmutableBiMap.of():66:66 -> t
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():189 -> t
-    3:4:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():191:192 -> t
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Dw:
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Fw$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1 -> com.android.tools.r8.internal.Ww:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse -> com.android.tools.r8.internal.Yw$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap this$0 -> e
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap):195:195 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap,com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$1):195:195 -> <init>
     1:1:void lambda$forEach$0(java.util.function.BiConsumer,java.lang.Object,java.lang.Object):210:210 -> a
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():204:204 -> f
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():195 -> f
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():204:204 -> e
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap inverse():195 -> e
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):209 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):210:210 -> forEach
@@ -11540,14 +11546,14 @@
     8:8:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableEntry.getKey():39:39 -> get
     8:8:java.lang.Object get(java.lang.Object):223 -> get
     9:9:java.lang.Object get(java.lang.Object):221:221 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():236:236 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():231:231 -> k
-    boolean isPartialView() -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():236:236 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():231:231 -> j
+    boolean isPartialView() -> m
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> s
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse.inverse():204:204 -> size
     1:1:int size():199 -> size
     2:2:int size():199:199 -> size
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():204:204 -> t
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Fw$a$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet -> com.android.tools.r8.internal.Yw$a$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse this$1 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse):240:240 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator iterator():258:258 -> c
@@ -11558,7 +11564,7 @@
     1:1:com.android.tools.r8.com.google.common.collect.UnmodifiableIterator com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet.iterator():258:258 -> iterator
     1:1:java.util.Iterator iterator():239 -> iterator
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap map():243:243 -> k
-com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.Ew:
+com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1 -> com.android.tools.r8.internal.Xw:
     com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet this$2 -> c
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet):268:268 -> <init>
     1:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):271:272 -> get
@@ -11567,7 +11573,7 @@
     3:3:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.RegularImmutableBiMap$Inverse$InverseEntrySet$1.get(int):272 -> get
     3:3:java.lang.Object get(int):268 -> get
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection delegateCollection():277:277 -> i
-com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Gw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableList -> com.android.tools.r8.internal.Zw:
     java.lang.Object[] array -> d
     com.android.tools.r8.com.google.common.collect.ImmutableList EMPTY -> c
     1:1:void <clinit>():31:31 -> <clinit>
@@ -11580,7 +11586,7 @@
     1:1:java.util.ListIterator listIterator(int):28 -> listIterator
     1:1:int size():42:42 -> size
     1:1:java.util.Spliterator spliterator():73:73 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.Jw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap -> com.android.tools.r8.internal.cx:
     java.util.Map$Entry[] entries -> f
     com.android.tools.r8.com.google.common.collect.ImmutableMapEntry[] table -> g
     int mask -> h
@@ -11614,12 +11620,12 @@
     1:1:void forEach(java.util.function.BiConsumer):151 -> forEach
     2:3:void forEach(java.util.function.BiConsumer):152:153 -> forEach
     1:1:java.lang.Object get(java.lang.Object):122:122 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():169:169 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():174:174 -> k
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> l
-    boolean isPartialView() -> n
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():169:169 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():174:174 -> j
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableCollection createValues():229:229 -> k
+    boolean isPartialView() -> m
     1:1:int size():159:159 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.Hw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$KeySet -> com.android.tools.r8.internal.ax:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):181:182 -> <init>
     boolean isPartialView() -> b
@@ -11628,13 +11634,13 @@
     2:2:boolean contains(java.lang.Object):192 -> contains
     1:1:java.lang.Object get(int):187:187 -> get
     1:1:int size():202:202 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.Iw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMap$Values -> com.android.tools.r8.internal.bx:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMap map -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMap):236:237 -> <init>
     boolean isPartialView() -> b
     1:1:java.lang.Object get(int):242:242 -> get
     1:1:int size():247:247 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.Lw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset -> com.android.tools.r8.internal.ex:
     com.android.tools.r8.com.google.common.collect.ImmutableSet elementSet -> j
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] entries -> f
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry[] hashTable -> g
@@ -11656,8 +11662,8 @@
     3:3:com.android.tools.r8.com.google.common.collect.Multiset$Entry getEntry(int):170:170 -> g
     1:1:int hashCode():175:175 -> hashCode
     1:1:int size():135:135 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.Kw:
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.Lw$a:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1 -> com.android.tools.r8.internal.dx:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$ElementSet -> com.android.tools.r8.internal.ex$a:
     com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset this$0 -> d
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset):145:145 -> <init>
     2:2:void <init>(com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset,com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$1):145:145 -> <init>
@@ -11667,11 +11673,11 @@
     2:2:boolean contains(java.lang.Object):154 -> contains
     1:1:java.lang.Object get(int):149:149 -> get
     1:1:int size():164:164 -> size
-com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.Mw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableMultiset$NonTerminalEntry -> com.android.tools.r8.internal.fx:
     com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket -> c
     1:2:void <init>(java.lang.Object,int,com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry):100:101 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.Multisets$ImmutableEntry nextInBucket():106:106 -> c
-com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.Nw:
+com.android.tools.r8.com.google.common.collect.RegularImmutableSet -> com.android.tools.r8.internal.gx:
     java.lang.Object[] elements -> e
     int hashCode -> h
     int mask -> g
@@ -11695,9 +11701,9 @@
     1:1:java.util.Iterator iterator():30 -> iterator
     1:1:int size():69:69 -> size
     1:1:java.util.Spliterator spliterator():79:79 -> spliterator
-com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.internal.Ow:
-    com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> f
-    com.android.tools.r8.com.google.common.collect.ImmutableList elements -> g
+com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet -> com.android.tools.r8.internal.hx:
+    com.android.tools.r8.com.google.common.collect.RegularImmutableSortedSet NATURAL_EMPTY_SET -> g
+    com.android.tools.r8.com.google.common.collect.ImmutableList elements -> h
     1:1:void <clinit>():44:44 -> <clinit>
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.com.google.common.collect.ImmutableList.of():81:81 -> <clinit>
     2:2:void <clinit>():45 -> <clinit>
@@ -11810,7 +11816,7 @@
     1:2:java.lang.Object lower(java.lang.Object):212:213 -> lower
     1:1:int size():77:77 -> size
     1:1:java.util.Spliterator spliterator():67:67 -> spliterator
-com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.Ex:
+com.android.tools.r8.com.google.common.collect.Sets$1 -> com.android.tools.r8.internal.Xx:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):744:744 -> <init>
@@ -11822,13 +11828,13 @@
     1:1:java.util.stream.Stream parallelStream():790:790 -> parallelStream
     1:3:int size():747:749 -> size
     1:1:java.util.stream.Stream stream():785:785 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.internal.Dx:
+com.android.tools.r8.com.google.common.collect.Sets$1$1 -> com.android.tools.r8.internal.Wx:
     java.util.Iterator itr2 -> d
     java.util.Iterator itr1 -> c
     com.android.tools.r8.com.google.common.collect.Sets$1 this$0 -> e
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):763:765 -> <init>
     1:10:java.lang.Object computeNext():769:778 -> l
-com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.Gx:
+com.android.tools.r8.com.google.common.collect.Sets$2 -> com.android.tools.r8.internal.Zx:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):842:842 -> <init>
@@ -11840,12 +11846,12 @@
     1:1:java.util.stream.Stream parallelStream():868:868 -> parallelStream
     1:2:int size():874:875 -> size
     1:1:java.util.stream.Stream stream():863:863 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.Fx:
+com.android.tools.r8.com.google.common.collect.Sets$2$1 -> com.android.tools.r8.internal.Yx:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$2 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$2):845:846 -> <init>
     1:7:java.lang.Object computeNext():850:856 -> l
-com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.Ix:
+com.android.tools.r8.com.google.common.collect.Sets$3 -> com.android.tools.r8.internal.by:
     java.util.Set val$set1 -> a
     java.util.Set val$set2 -> b
     1:1:void <init>(java.util.Set,java.util.Set):914:914 -> <init>
@@ -11858,12 +11864,12 @@
     1:1:java.util.stream.Stream parallelStream():939:939 -> parallelStream
     1:2:int size():945:946 -> size
     1:1:java.util.stream.Stream stream():934:934 -> stream
-com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.Hx:
+com.android.tools.r8.com.google.common.collect.Sets$3$1 -> com.android.tools.r8.internal.ay:
     java.util.Iterator itr -> c
     com.android.tools.r8.com.google.common.collect.Sets$3 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$3):917:918 -> <init>
     1:7:java.lang.Object computeNext():921:927 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.Mx:
+com.android.tools.r8.com.google.common.collect.Sets$5 -> com.android.tools.r8.internal.fy:
     com.android.tools.r8.com.google.common.collect.ImmutableMap val$index -> b
     int val$size -> a
     1:1:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableMap):1676:1676 -> <init>
@@ -11871,31 +11877,31 @@
     1:1:java.util.Iterator iterator():1688:1688 -> iterator
     1:1:int size():1755:1755 -> size
     1:1:java.lang.String toString():1760:1760 -> toString
-com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.Lx:
+com.android.tools.r8.com.google.common.collect.Sets$5$1 -> com.android.tools.r8.internal.ey:
     java.util.BitSet bits -> c
     com.android.tools.r8.com.google.common.collect.Sets$5 this$0 -> d
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5):1688:1689 -> <init>
     1:29:java.util.Set com.android.tools.r8.com.google.common.collect.Sets$5$1.computeNext():1693:1721 -> l
     1:29:java.lang.Object computeNext():1688 -> l
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.Kx:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1 -> com.android.tools.r8.internal.dy:
     com.android.tools.r8.com.google.common.collect.Sets$5$1 this$1 -> b
     java.util.BitSet val$copy -> a
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1,java.util.BitSet):1721:1721 -> <init>
     1:2:boolean contains(java.lang.Object):1724:1725 -> contains
     1:1:java.util.Iterator iterator():1730:1730 -> iterator
     1:1:int size():1746:1746 -> size
-com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.Jx:
+com.android.tools.r8.com.google.common.collect.Sets$5$1$1$1 -> com.android.tools.r8.internal.cy:
     com.android.tools.r8.com.google.common.collect.Sets$5$1$1 this$2 -> d
     int i -> c
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Sets$5$1$1):1730:1731 -> <init>
     1:5:java.lang.Object computeNext():1735:1739 -> l
-com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.Nx:
+com.android.tools.r8.com.google.common.collect.Sets$ImprovedAbstractSet -> com.android.tools.r8.internal.gy:
     1:1:void <init>():77:77 -> <init>
     1:1:boolean removeAll(java.util.Collection):80:80 -> removeAll
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> retainAll
     1:1:boolean retainAll(java.util.Collection):85 -> retainAll
     2:2:boolean retainAll(java.util.Collection):85:85 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.Ox:
+com.android.tools.r8.com.google.common.collect.Sets$SetView -> com.android.tools.r8.internal.hy:
     1:1:void <init>(com.android.tools.r8.com.google.common.collect.Sets$1):599:599 -> <init>
     2:2:void <init>():600:600 -> <init>
     1:1:boolean add(java.lang.Object):640:640 -> add
@@ -11905,7 +11911,7 @@
     1:1:boolean removeAll(java.util.Collection):679:679 -> removeAll
     1:1:boolean removeIf(java.util.function.Predicate):692:692 -> removeIf
     1:1:boolean retainAll(java.util.Collection):705:705 -> retainAll
-com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.Px:
+com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet -> com.android.tools.r8.internal.iy:
     java.util.SortedSet unmodifiableDelegate -> b
     java.util.NavigableSet delegate -> a
     com.android.tools.r8.com.google.common.collect.Sets$UnmodifiableNavigableSet descendingSet -> c
@@ -11932,7 +11938,7 @@
     1:1:java.util.stream.Stream stream():1847:1847 -> stream
     1:3:java.util.NavigableSet subSet(java.lang.Object,boolean,java.lang.Object,boolean):1910:1910 -> subSet
     1:1:java.util.NavigableSet tailSet(java.lang.Object,boolean):1921:1921 -> tailSet
-com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.hy:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap -> com.android.tools.r8.internal.Ay:
     java.lang.Object singleValue -> f
     com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse -> g
     java.lang.Object singleKey -> e
@@ -11940,23 +11946,23 @@
     5:8:void <init>(java.lang.Object,java.lang.Object,com.android.tools.r8.com.google.common.collect.ImmutableBiMap):47:50 -> <init>
     1:1:boolean containsKey(java.lang.Object):70:70 -> containsKey
     1:1:boolean containsValue(java.lang.Object):75:75 -> containsValue
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap.inverse():100:102 -> f
-    1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> f
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap com.android.tools.r8.com.google.common.collect.SingletonImmutableBiMap.inverse():100:102 -> e
+    1:3:com.android.tools.r8.com.google.common.collect.BiMap inverse():34 -> e
     1:1:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> forEach
     1:1:void forEach(java.util.function.BiConsumer):65 -> forEach
     2:2:void forEach(java.util.function.BiConsumer):65:65 -> forEach
     1:1:java.lang.Object get(java.lang.Object):55:55 -> get
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> j
-    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> j
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> j
-    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> j
-    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> j
-    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> k
-    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> k
-    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90 -> k
-    boolean isPartialView() -> n
-    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> t
-com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.iy:
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85:85 -> i
+    2:2:java.util.Map$Entry com.android.tools.r8.com.google.common.collect.Maps.immutableEntry(java.lang.Object,java.lang.Object):1421:1421 -> i
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> i
+    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> i
+    3:86:com.android.tools.r8.com.google.common.collect.ImmutableSet createEntrySet():85 -> i
+    1:1:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90:90 -> j
+    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet com.android.tools.r8.com.google.common.collect.ImmutableSet.of(java.lang.Object):0:83 -> j
+    2:85:com.android.tools.r8.com.google.common.collect.ImmutableSet createKeySet():90 -> j
+    boolean isPartialView() -> m
+    1:3:com.android.tools.r8.com.google.common.collect.ImmutableBiMap inverse():100:102 -> s
+com.android.tools.r8.com.google.common.collect.SingletonImmutableList -> com.android.tools.r8.internal.By:
     java.lang.Object element -> c
     1:2:void <init>(java.lang.Object):37:38 -> <init>
     boolean isPartialView() -> b
@@ -11971,7 +11977,7 @@
     1:1:java.util.Spliterator spliterator():54:54 -> spliterator
     1:1:java.util.List subList(int,int):31:31 -> subList
     1:1:java.lang.String toString():70:70 -> toString
-com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.jy:
+com.android.tools.r8.com.google.common.collect.SingletonImmutableSet -> com.android.tools.r8.internal.Cy:
     java.lang.Object element -> d
     int cachedHashCode -> e
     1:2:void <init>(java.lang.Object):44:45 -> <init>
@@ -11988,28 +11994,28 @@
     1:1:boolean isHashCodeFast():97:97 -> h
     1:3:int hashCode():88:90 -> hashCode
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.internal.qy:
-com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.Sy:
+com.android.tools.r8.com.google.common.collect.SortedIterable -> com.android.tools.r8.internal.Jy:
+com.android.tools.r8.com.google.common.collect.Streams$1 -> com.android.tools.r8.internal.lz:
     java.util.function.BiFunction val$function -> c
     java.util.Iterator val$itrB -> b
     java.util.Iterator val$itrA -> a
     1:1:void <init>(long,int,java.util.Iterator,java.util.Iterator,java.util.function.BiFunction):249:249 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):252:253 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.Ty:
+com.android.tools.r8.com.google.common.collect.Streams$1Splitr -> com.android.tools.r8.internal.mz:
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> d
     java.lang.Object holder -> c
     1:2:void <init>(java.util.Spliterator,long,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):369:370 -> <init>
     1:1:void accept(java.lang.Object):375:375 -> accept
     1:6:boolean tryAdvance(java.util.function.Consumer):380:385 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.Uy:
+com.android.tools.r8.com.google.common.collect.Streams$2 -> com.android.tools.r8.internal.nz:
     java.util.Iterator val$fromIterator -> b
     long index -> a
     com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex val$function -> c
     1:2:void <init>(long,int,java.util.Iterator,com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex):352:353 -> <init>
     1:2:boolean tryAdvance(java.util.function.Consumer):357:358 -> tryAdvance
-com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.Vy:
+com.android.tools.r8.com.google.common.collect.Streams$FunctionWithIndex -> com.android.tools.r8.internal.oz:
     java.lang.Object apply(java.lang.Object,long) -> a
-com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.Wy:
+com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator -> com.android.tools.r8.internal.pz:
     long index -> b
     java.util.Spliterator fromSpliterator -> a
     1:3:void <init>(java.util.Spliterator,long):419:421 -> <init>
@@ -12023,17 +12029,17 @@
     6:6:java.util.Spliterator trySplit():413 -> trySplit
     7:7:com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator com.android.tools.r8.com.google.common.collect.Streams$MapWithIndexSpliterator.trySplit():434:434 -> trySplit
     7:7:java.util.Spliterator trySplit():413 -> trySplit
-com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.JA:
+com.android.tools.r8.com.google.common.collect.TransformedIterator -> com.android.tools.r8.internal.cB:
     java.util.Iterator backingIterator -> a
     1:2:void <init>(java.util.Iterator):35:36 -> <init>
     java.lang.Object transform(java.lang.Object) -> a
     1:1:boolean hasNext():43:43 -> hasNext
     1:1:java.lang.Object next():48:48 -> next
     1:1:void remove():53:53 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.cC:
+com.android.tools.r8.com.google.common.collect.UnmodifiableIterator -> com.android.tools.r8.internal.xC:
     1:1:void <init>():35:35 -> <init>
     1:1:void remove():46:46 -> remove
-com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.dC:
+com.android.tools.r8.com.google.common.collect.UnmodifiableListIterator -> com.android.tools.r8.internal.yC:
     1:1:void <init>():33:33 -> <init>
     1:1:void add(java.lang.Object):44:44 -> add
     1:1:void set(java.lang.Object):56:56 -> set
@@ -12045,7 +12051,7 @@
     com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[],int,int) -> a
     1:1:com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset):55:55 -> a
     2:2:com.android.tools.r8.com.google.common.hash.Hasher putBytes(byte[]):60:60 -> a
-com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.Xb:
+com.android.tools.r8.com.google.common.hash.HashCode -> com.android.tools.r8.internal.gc:
     char[] hexDigits -> a
     int $r8$clinit -> b
     1:1:void <clinit>():429:429 -> <clinit>
@@ -12058,7 +12064,7 @@
     1:3:boolean equals(java.lang.Object):380:382 -> equals
     1:8:int hashCode():396:403 -> hashCode
     1:6:java.lang.String toString():421:426 -> toString
-com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.Vb:
+com.android.tools.r8.com.google.common.hash.HashCode$BytesHashCode -> com.android.tools.r8.internal.ec:
     byte[] bytes -> c
     1:2:void <init>(byte[]):262:263 -> <init>
     1:1:byte[] asBytes():273:273 -> a
@@ -12066,29 +12072,29 @@
     1:5:int asInt():278:282 -> b
     1:1:int bits():268:268 -> c
     1:1:byte[] getBytesInternal():313:313 -> d
-com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.Wb:
+com.android.tools.r8.com.google.common.hash.HashCode$IntHashCode -> com.android.tools.r8.internal.fc:
     int hash -> c
     1:2:void <init>(int):125:126 -> <init>
     1:1:byte[] asBytes():136:136 -> a
     2:2:boolean equalsSameBits(com.android.tools.r8.com.google.common.hash.HashCode):168:168 -> a
     1:1:int asInt():146:146 -> b
     int bits() -> c
-com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.Zb:
+com.android.tools.r8.com.google.common.hash.HashFunction -> com.android.tools.r8.internal.ic:
     com.android.tools.r8.com.google.common.hash.HashCode hashString(java.lang.CharSequence,java.nio.charset.Charset) -> a
     com.android.tools.r8.com.google.common.hash.Hasher newHasher() -> a
-com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.bc:
+com.android.tools.r8.com.google.common.hash.Hasher -> com.android.tools.r8.internal.kc:
     com.android.tools.r8.com.google.common.hash.HashCode hash() -> a
     com.android.tools.r8.com.google.common.hash.Hasher putInt(int) -> a
     com.android.tools.r8.com.google.common.hash.Hasher putString(java.lang.CharSequence,java.nio.charset.Charset) -> a
-com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.dc:
+com.android.tools.r8.com.google.common.hash.Hashing -> com.android.tools.r8.internal.mc:
     int GOOD_FAST_HASH_SEED -> a
     1:1:void <clinit>():90:90 -> <clinit>
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction murmur3_32():111:111 -> a
     1:1:com.android.tools.r8.com.google.common.hash.HashFunction sha256():200:200 -> b
-com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.cc:
+com.android.tools.r8.com.google.common.hash.Hashing$Sha256Holder -> com.android.tools.r8.internal.lc:
     com.android.tools.r8.com.google.common.hash.HashFunction SHA_256 -> a
     1:1:void <clinit>():204:204 -> <clinit>
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.lo:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction -> com.android.tools.r8.internal.xo:
     java.security.MessageDigest prototype -> a
     int bytes -> b
     boolean supportsClone -> c
@@ -12103,8 +12109,8 @@
     15:15:java.security.MessageDigest com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction.getMessageDigest(java.lang.String):79:79 -> a
     15:15:com.android.tools.r8.com.google.common.hash.Hasher newHasher():92 -> a
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.jo:
-com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.ko:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$1 -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher -> com.android.tools.r8.internal.wo:
     java.security.MessageDigest digest -> b
     java.nio.ByteBuffer com.android.tools.r8.com.google.common.hash.AbstractByteHasher.scratch -> a
     int bytes -> c
@@ -12136,7 +12142,7 @@
     4:4:void com.android.tools.r8.com.google.common.hash.MessageDigestHashFunction$MessageDigestHasher.checkNotDone():149:149 -> b
     4:4:void update(byte[],int,int):138 -> b
     5:5:void update(byte[],int,int):139:139 -> b
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.sp:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction -> com.android.tools.r8.internal.Ep:
     com.android.tools.r8.com.google.common.hash.HashFunction MURMUR3_32 -> a
     1:3:void <clinit>():53:55 -> <clinit>
     1:1:void <init>(int):65:65 -> <init>
@@ -12167,7 +12173,7 @@
     1:3:boolean equals(java.lang.Object):86:88 -> equals
     1:1:int hashCode():95:95 -> hashCode
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.rp:
+com.android.tools.r8.com.google.common.hash.Murmur3_32HashFunction$Murmur3_32Hasher -> com.android.tools.r8.internal.Dp:
     long buffer -> b
     boolean isDone -> e
     int length -> d
@@ -12269,7 +12275,7 @@
     1:1:void write(byte[]):603 -> write
     2:2:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> write
     2:2:void write(byte[],int,int):609 -> write
-com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.X4:
+com.android.tools.r8.com.google.common.io.CharSequenceReader -> com.android.tools.r8.internal.Y4:
     java.lang.CharSequence seq -> a
     int pos -> b
     int mark -> c
@@ -12287,11 +12293,11 @@
     1:1:boolean ready():106:106 -> ready
     1:2:void reset():124:125 -> reset
     1:4:long skip(long):97:100 -> skip
-com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.a5:
+com.android.tools.r8.com.google.common.io.CharSource -> com.android.tools.r8.internal.b5:
     1:1:void <init>():76:76 -> <init>
     java.io.Reader openStream() -> a
     1:1:com.android.tools.r8.com.google.common.io.CharSource wrap(java.lang.CharSequence):479:479 -> a
-com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.Y4:
+com.android.tools.r8.com.google.common.io.CharSource$CharSequenceCharSource -> com.android.tools.r8.internal.Z4:
     java.lang.CharSequence seq -> a
     1:1:void <clinit>():525:525 -> <clinit>
     1:2:void <init>(java.lang.CharSequence):529:530 -> <init>
@@ -12303,13 +12309,13 @@
     3:21:java.lang.String com.android.tools.r8.com.google.common.base.Ascii.truncate(java.lang.CharSequence,int,java.lang.String):553:571 -> toString
     3:21:java.lang.String toString():609 -> toString
     22:22:java.lang.String toString():609:609 -> toString
-com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.Z4:
+com.android.tools.r8.com.google.common.io.CharSource$StringCharSource -> com.android.tools.r8.internal.a5:
     1:1:void <init>(java.lang.String):630:630 -> <init>
     1:1:java.io.Reader openStream():635:635 -> a
-com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.r6:
+com.android.tools.r8.com.google.common.io.Closeables -> com.android.tools.r8.internal.w6:
     java.util.logging.Logger logger -> a
     1:1:void <clinit>():37:37 -> <clinit>
-com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.v6:
+com.android.tools.r8.com.google.common.io.Closer -> com.android.tools.r8.internal.A6:
     com.android.tools.r8.com.google.common.io.Closer$Suppressor suppressor -> b
     com.android.tools.r8.com.google.common.io.Closer$Suppressor SUPPRESSOR -> a
     java.util.Deque stack -> c
@@ -12344,12 +12350,12 @@
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfInstanceOf(java.lang.Throwable,java.lang.Class):104 -> close
     25:25:void com.android.tools.r8.com.google.common.base.Throwables.propagateIfPossible(java.lang.Throwable,java.lang.Class):184 -> close
     25:25:void close():227 -> close
-com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.s6:
+com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor -> com.android.tools.r8.internal.x6:
     com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor INSTANCE -> a
     1:1:void <clinit>():251:251 -> <clinit>
     1:1:void <init>():249:249 -> <init>
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
-com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.t6:
+com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor -> com.android.tools.r8.internal.y6:
     com.android.tools.r8.com.google.common.io.Closer$SuppressingSuppressor INSTANCE -> a
     java.lang.reflect.Method addSuppressed -> b
     1:1:void <clinit>():268:268 -> <clinit>
@@ -12360,9 +12366,9 @@
     1:1:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):291:291 -> a
     2:2:void com.android.tools.r8.com.google.common.io.Closer$LoggingSuppressor.suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):256:256 -> a
     2:2:void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable):294 -> a
-com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.u6:
+com.android.tools.r8.com.google.common.io.Closer$Suppressor -> com.android.tools.r8.internal.z6:
     void suppress(java.io.Closeable,java.lang.Throwable,java.lang.Throwable) -> a
-com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.com.google.common.math.IntMath -> com.android.tools.r8.internal.Rf:
     int[] biggestBinomials -> a
     1:1:void <clinit>():675:675 -> <clinit>
     boolean isPowerOfTwo(int) -> a
@@ -12382,12 +12388,12 @@
     107:107:void com.android.tools.r8.com.google.common.math.MathPreconditions.checkRoundingUnnecessary(boolean):81:81 -> a
     107:107:int divide(int,int,java.math.RoundingMode):340 -> a
     108:108:int divide(int,int,java.math.RoundingMode):320:320 -> a
-com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Df:
+com.android.tools.r8.com.google.common.math.IntMath$1 -> com.android.tools.r8.internal.Qf:
     int[] $SwitchMap$java$math$RoundingMode -> a
     1:1:void <clinit>():121:121 -> <clinit>
-com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.Qn:
+com.android.tools.r8.com.google.common.math.MathPreconditions -> com.android.tools.r8.internal.co:
     1:1:int checkNonNegative(java.lang.String,int):53:53 -> a
-com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.Xg:
+com.android.tools.r8.com.google.gson.JsonArray -> com.android.tools.r8.internal.kh:
     java.util.List elements -> a
     1:2:void <init>():39:40 -> <init>
     1:1:void add(java.lang.Number):76:76 -> a
@@ -12402,7 +12408,7 @@
     1:1:int hashCode():371:371 -> hashCode
     1:1:java.util.Iterator iterator():171:171 -> iterator
     1:1:int size():161:161 -> size
-com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.Yg:
+com.android.tools.r8.com.google.gson.JsonElement -> com.android.tools.r8.internal.lh:
     1:1:void <init>():33:33 -> <init>
     1:1:boolean getAsBoolean():152:152 -> a
     1:1:int getAsInt():243:243 -> b
@@ -12418,15 +12424,15 @@
     4:4:void com.android.tools.r8.com.google.gson.internal.Streams.write(com.android.tools.r8.com.google.gson.JsonElement,com.android.tools.r8.com.google.gson.stream.JsonWriter):72:72 -> toString
     4:4:java.lang.String toString():324 -> toString
     5:7:java.lang.String toString():325:327 -> toString
-com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.Zg:
+com.android.tools.r8.com.google.gson.JsonIOException -> com.android.tools.r8.internal.mh:
     1:1:void <init>(java.lang.Throwable):43:43 -> <init>
-com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.ah:
+com.android.tools.r8.com.google.gson.JsonNull -> com.android.tools.r8.internal.nh:
     com.android.tools.r8.com.google.gson.JsonNull INSTANCE -> a
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:boolean equals(java.lang.Object):61:61 -> equals
     1:1:int hashCode():53:53 -> hashCode
-com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.bh:
+com.android.tools.r8.com.google.gson.JsonObject -> com.android.tools.r8.internal.oh:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap members -> a
     1:2:void <init>():32:33 -> <init>
     1:3:void add(java.lang.String,com.android.tools.r8.com.google.gson.JsonElement):55:57 -> a
@@ -12445,11 +12451,11 @@
     1:1:java.util.Set entrySet():132:132 -> entrySet
     1:2:boolean equals(java.lang.Object):196:197 -> equals
     1:1:int hashCode():202:202 -> hashCode
-com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.ch:
+com.android.tools.r8.com.google.gson.JsonParseException -> com.android.tools.r8.internal.ph:
     1:1:void <init>(java.lang.String):42:42 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable):52:52 -> <init>
     3:3:void <init>(java.lang.Throwable):62:62 -> <init>
-com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.dh:
+com.android.tools.r8.com.google.gson.JsonParser -> com.android.tools.r8.internal.qh:
     1:1:void <init>():34:34 -> <init>
     1:1:com.android.tools.r8.com.google.gson.JsonElement parse(java.lang.String):45:45 -> a
     2:3:com.android.tools.r8.com.google.gson.JsonElement com.android.tools.r8.com.google.gson.JsonParser.parse(java.io.Reader):58:59 -> a
@@ -12466,7 +12472,7 @@
     91:100:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):81:90 -> a
     101:101:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):88:88 -> a
     102:106:com.android.tools.r8.com.google.gson.JsonElement parse(com.android.tools.r8.com.google.gson.stream.JsonReader):86:90 -> a
-com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.eh:
+com.android.tools.r8.com.google.gson.JsonPrimitive -> com.android.tools.r8.internal.rh:
     java.lang.Class[] PRIMITIVE_TYPES -> a
     java.lang.Object value -> b
     1:1:void <clinit>():35:35 -> <clinit>
@@ -12505,20 +12511,20 @@
     1:1:java.lang.Number getAsNumber():157:157 -> i
     1:1:boolean isBoolean():112:112 -> j
     1:1:boolean isNumber():146:146 -> k
-com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.gh:
+com.android.tools.r8.com.google.gson.JsonSyntaxException -> com.android.tools.r8.internal.th:
     1:1:void <init>(java.lang.String):30:30 -> <init>
     2:2:void <init>(java.lang.Throwable):45:45 -> <init>
-com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.YA:
+com.android.tools.r8.com.google.gson.TypeAdapter -> com.android.tools.r8.internal.sB:
     1:1:void <init>():119:119 -> <init>
     java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader) -> a
     void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object) -> a
     1:1:com.android.tools.r8.com.google.gson.TypeAdapter nullSafe():186:186 -> a
-com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.XA:
+com.android.tools.r8.com.google.gson.TypeAdapter$1 -> com.android.tools.r8.internal.rB:
     com.android.tools.r8.com.google.gson.TypeAdapter this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.TypeAdapter):186:186 -> <init>
     1:3:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):189:191 -> a
     4:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):195:199 -> a
-com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.Rl:
+com.android.tools.r8.com.google.gson.internal.LazilyParsedNumber -> com.android.tools.r8.internal.em:
     java.lang.String value -> a
     1:2:void <init>(java.lang.String):30:31 -> <init>
     1:1:double doubleValue():63:63 -> doubleValue
@@ -12528,7 +12534,7 @@
     1:6:int intValue():37:42 -> intValue
     1:3:long longValue():50:52 -> longValue
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.Bm:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap -> com.android.tools.r8.internal.Om:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node root -> d
     int modCount -> f
     java.util.Comparator comparator -> c
@@ -12571,12 +12577,12 @@
     1:3:java.lang.Object remove(java.lang.Object):111 -> remove
     4:4:java.lang.Object remove(java.lang.Object):112:112 -> remove
     1:1:int size():78:78 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.zm:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1 -> com.android.tools.r8.internal.Mm:
     1:1:void <init>():40:40 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):40:40 -> compare
     2:2:int com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$1.compare(java.lang.Comparable,java.lang.Comparable):42:42 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):40 -> compare
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.Bm$a:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet -> com.android.tools.r8.internal.Om$a:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):560:560 -> <init>
     1:1:void clear():591:591 -> clear
@@ -12584,11 +12590,11 @@
     1:1:java.util.Iterator iterator():566:566 -> iterator
     1:9:boolean remove(java.lang.Object):578:586 -> remove
     1:1:int size():562:562 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.Am:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1 -> com.android.tools.r8.internal.Nm:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet):566:566 -> <init>
     1:1:java.util.Map$Entry com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$EntrySet$1.next():568:568 -> next
     1:1:java.lang.Object next():566 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.Bm$b:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet -> com.android.tools.r8.internal.Om$b:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap):595:595 -> <init>
     1:1:void clear():617:617 -> clear
@@ -12600,10 +12606,10 @@
     2:4:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node com.android.tools.r8.com.google.gson.internal.LinkedTreeMap.removeInternalByKey(java.lang.Object):277:279 -> remove
     2:4:boolean remove(java.lang.Object):613 -> remove
     1:1:int size():597:597 -> size
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.Cm:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet$1 -> com.android.tools.r8.internal.Pm:
     1:1:void <init>(com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$KeySet):601:601 -> <init>
     1:1:java.lang.Object next():603:603 -> next
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.Bm$c:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$LinkedTreeMapIterator -> com.android.tools.r8.internal.Om$c:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap this$0 -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node lastReturned -> b
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> a
@@ -12616,7 +12622,7 @@
     11:11:com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node nextNode():541:541 -> l
     1:6:void remove():551:556 -> remove
     7:7:void remove():552:552 -> remove
-com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.Dm:
+com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node -> com.android.tools.r8.internal.Qm:
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node next -> d
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node right -> c
     com.android.tools.r8.com.google.gson.internal.LinkedTreeMap$Node prev -> e
@@ -12633,7 +12639,7 @@
     1:2:int hashCode():491:492 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):475:476 -> setValue
     1:1:java.lang.String toString():496:496 -> toString
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.vB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters -> com.android.tools.r8.internal.PB:
     com.android.tools.r8.com.google.gson.TypeAdapter STRING -> l
     com.android.tools.r8.com.google.gson.TypeAdapter STRING_BUILDER -> m
     com.android.tools.r8.com.google.gson.TypeAdapter NUMBER -> j
@@ -12657,21 +12663,21 @@
     com.android.tools.r8.com.google.gson.TypeAdapter CURRENCY -> s
     com.android.tools.r8.com.google.gson.TypeAdapter JSON_ELEMENT -> v
     1:646:void <clinit>():69:714 -> <clinit>
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.eB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1 -> com.android.tools.r8.internal.yB:
     1:1:void <init>():69:69 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69:69 -> a
     2:5:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Class):73:76 -> a
     2:5:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):69 -> a
     6:10:java.lang.Class com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$1.read(com.android.tools.r8.com.google.gson.stream.JsonReader):81:85 -> a
     6:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):69 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.ZA:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10 -> com.android.tools.r8.internal.tB:
     1:1:void <init>():282:282 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282:282 -> a
     2:6:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicIntegerArray):303:307 -> a
     2:6:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):282 -> a
     7:21:java.util.concurrent.atomic.AtomicIntegerArray com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$10.read(com.android.tools.r8.com.google.gson.stream.JsonReader):284:298 -> a
     7:21:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):282 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.aB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14 -> com.android.tools.r8.internal.uB:
     1:1:void <init>():362:362 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):362:362 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):378:378 -> a
@@ -12680,7 +12686,7 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
     12:12:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$14.read(com.android.tools.r8.com.google.gson.stream.JsonReader):371:371 -> a
     12:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):362 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.bB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15 -> com.android.tools.r8.internal.vB:
     1:1:void <init>():384:384 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):384:384 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Character):399:399 -> a
@@ -12689,21 +12695,21 @@
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
     12:12:java.lang.Character com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$15.read(com.android.tools.r8.com.google.gson.stream.JsonReader):393:393 -> a
     12:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):384 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.cB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16 -> com.android.tools.r8.internal.wB:
     1:1:void <init>():406:406 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406:406 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.String):422:422 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):406 -> a
     3:12:java.lang.String com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$16.read(com.android.tools.r8.com.google.gson.stream.JsonReader):409:418 -> a
     3:12:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):406 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.dB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19 -> com.android.tools.r8.internal.xB:
     1:1:void <init>():464:464 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464:464 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuilder):475:475 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):464 -> a
     3:7:java.lang.StringBuilder com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$19.read(com.android.tools.r8.com.google.gson.stream.JsonReader):467:471 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):464 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.oB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2 -> com.android.tools.r8.internal.IB:
     1:1:void <init>():92:92 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):92:92 -> a
     2:11:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.BitSet):136:145 -> a
@@ -12716,63 +12722,63 @@
     42:63:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
     64:77:java.util.BitSet com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$2.read(com.android.tools.r8.com.google.gson.stream.JsonReader):117:130 -> a
     64:77:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):92 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.fB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20 -> com.android.tools.r8.internal.zB:
     1:1:void <init>():482:482 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482:482 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.StringBuffer):493:493 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):482 -> a
     3:7:java.lang.StringBuffer com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$20.read(com.android.tools.r8.com.google.gson.stream.JsonReader):485:489 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):482 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.gB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21 -> com.android.tools.r8.internal.AB:
     1:1:void <init>():500:500 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500:500 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URL):512:512 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):500 -> a
     3:8:java.net.URL com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$21.read(com.android.tools.r8.com.google.gson.stream.JsonReader):503:508 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):500 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.hB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22 -> com.android.tools.r8.internal.BB:
     1:1:void <init>():518:518 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518:518 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.URI):534:534 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):518 -> a
     3:11:java.net.URI com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$22.read(com.android.tools.r8.com.google.gson.stream.JsonReader):521:529 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):518 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.iB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23 -> com.android.tools.r8.internal.CB:
     1:1:void <init>():540:540 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540:540 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.net.InetAddress):552:552 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):540 -> a
     3:8:java.net.InetAddress com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$23.read(com.android.tools.r8.com.google.gson.stream.JsonReader):543:548 -> a
     3:8:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):540 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.jB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24 -> com.android.tools.r8.internal.DB:
     1:1:void <init>():559:559 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559:559 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.UUID):570:570 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):559 -> a
     3:7:java.util.UUID com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$24.read(com.android.tools.r8.com.google.gson.stream.JsonReader):562:566 -> a
     3:7:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):559 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.kB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25 -> com.android.tools.r8.internal.EB:
     1:1:void <init>():576:576 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576:576 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Currency):583:583 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):576 -> a
     3:3:java.util.Currency com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$25.read(com.android.tools.r8.com.google.gson.stream.JsonReader):579:579 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):576 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.lB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27 -> com.android.tools.r8.internal.FB:
     1:1:void <init>():609:609 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609:609 -> a
     2:18:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Calendar):654:670 -> a
     2:18:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):609 -> a
     19:48:java.util.Calendar com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$27.read(com.android.tools.r8.com.google.gson.stream.JsonReader):619:648 -> a
     19:48:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):609 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.mB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28 -> com.android.tools.r8.internal.GB:
     1:1:void <init>():677:677 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677:677 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.Locale):708:708 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):677 -> a
     3:26:java.util.Locale com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$28.read(com.android.tools.r8.com.google.gson.stream.JsonReader):680:703 -> a
     3:26:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):677 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.nB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$29 -> com.android.tools.r8.internal.HB:
     1:1:void <init>():714:714 -> <init>
     1:1:boolean com.android.tools.r8.com.google.gson.JsonElement.isJsonNull():74:74 -> a
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,com.android.tools.r8.com.google.gson.JsonElement):753 -> a
@@ -12798,49 +12804,49 @@
     37:38:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):720:721 -> b
     39:62:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):718:741 -> b
     63:68:com.android.tools.r8.com.google.gson.JsonElement read(com.android.tools.r8.com.google.gson.stream.JsonReader):728:733 -> b
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.pB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3 -> com.android.tools.r8.internal.JB:
     1:1:void <init>():151:151 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151:151 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Boolean):165:165 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):151 -> a
     3:10:java.lang.Boolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$3.read(com.android.tools.r8.com.google.gson.stream.JsonReader):154:161 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):151 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.qB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5 -> com.android.tools.r8.internal.KB:
     1:1:void <init>():190:190 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190:190 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):206:206 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):190 -> a
     3:11:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$5.read(com.android.tools.r8.com.google.gson.stream.JsonReader):193:201 -> a
     3:11:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):190 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.rB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6 -> com.android.tools.r8.internal.LB:
     1:1:void <init>():213:213 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213:213 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):228:228 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):213 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$6.read(com.android.tools.r8.com.google.gson.stream.JsonReader):216:223 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):213 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.sB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7 -> com.android.tools.r8.internal.MB:
     1:1:void <init>():235:235 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235:235 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Number):250:250 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):235 -> a
     3:10:java.lang.Number com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$7.read(com.android.tools.r8.com.google.gson.stream.JsonReader):238:245 -> a
     3:10:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):235 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.tB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8 -> com.android.tools.r8.internal.NB:
     1:1:void <init>():256:256 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256:256 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicInteger):265:265 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):256 -> a
     3:5:java.util.concurrent.atomic.AtomicInteger com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$8.read(com.android.tools.r8.com.google.gson.stream.JsonReader):259:261 -> a
     3:5:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):256 -> a
-com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.uB:
+com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9 -> com.android.tools.r8.internal.OB:
     1:1:void <init>():271:271 -> <init>
     1:1:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271:271 -> a
     2:2:void com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.util.concurrent.atomic.AtomicBoolean):276:276 -> a
     2:2:void write(com.android.tools.r8.com.google.gson.stream.JsonWriter,java.lang.Object):271 -> a
     3:3:java.util.concurrent.atomic.AtomicBoolean com.android.tools.r8.com.google.gson.internal.bind.TypeAdapters$9.read(com.android.tools.r8.com.google.gson.stream.JsonReader):273:273 -> a
     3:3:java.lang.Object read(com.android.tools.r8.com.google.gson.stream.JsonReader):271 -> a
-com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.fh:
+com.android.tools.r8.com.google.gson.stream.JsonReader -> com.android.tools.r8.internal.sh:
     char[] NON_EXECUTE_PREFIX -> a
     long peekedLong -> j
     int stackSize -> n
@@ -12937,7 +12943,7 @@
     54:54:com.android.tools.r8.com.google.gson.stream.JsonToken peek():430:430 -> p
     1:5:void skipToEndOfLine():1411:1415 -> q
     1:1:java.lang.String toString():1445:1445 -> toString
-com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.internal.hh:
+com.android.tools.r8.com.google.gson.stream.JsonToken -> com.android.tools.r8.internal.uh:
     com.android.tools.r8.com.google.gson.stream.JsonToken END_ARRAY -> b
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_OBJECT -> c
     com.android.tools.r8.com.google.gson.stream.JsonToken BEGIN_ARRAY -> a
@@ -12952,7 +12958,7 @@
     1:54:void <clinit>():31:84 -> <clinit>
     55:55:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.ih:
+com.android.tools.r8.com.google.gson.stream.JsonWriter -> com.android.tools.r8.internal.vh:
     java.lang.String separator -> f
     java.lang.String deferredName -> h
     boolean serializeNulls -> i
@@ -13005,7 +13011,7 @@
     10:11:void writeDeferredName():402:403 -> h
     12:12:void com.android.tools.r8.com.google.gson.stream.JsonWriter.beforeName():616:616 -> h
     12:12:void writeDeferredName():401 -> h
-com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.zn:
+com.android.tools.r8.com.google.gson.stream.MalformedJsonException -> com.android.tools.r8.internal.Ln:
     1:1:void <init>(java.lang.String):29:29 -> <init>
 com.android.tools.r8.compatproguard.CompatProguard -> com.android.tools.r8.compatproguard.CompatProguard:
     1:21:void run(java.lang.String[]):190:210 -> a
@@ -13160,10 +13166,10 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):160:160 -> <init>
     2:13:void <init>(com.android.tools.r8.graph.AppView,java.util.List,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier,com.android.tools.r8.DexIndexedConsumer):177:188 -> <init>
     1:1:java.util.List distribute(java.util.concurrent.ExecutorService):195:195 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():428:428 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():429:429 -> a
     2:2:java.util.List distribute(java.util.concurrent.ExecutorService):195 -> a
     3:3:java.util.List distribute(java.util.concurrent.ExecutorService):196:196 -> a
-    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():444:444 -> a
+    4:4:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():445:445 -> a
     4:4:java.util.List distribute(java.util.concurrent.ExecutorService):197 -> a
     5:14:java.util.List distribute(java.util.concurrent.ExecutorService):197:206 -> a
     15:16:void encodeChecksums(java.lang.Iterable):216:217 -> a
@@ -13173,10 +13179,10 @@
     28:28:java.lang.Boolean lambda$write$0(java.util.List,com.android.tools.r8.ir.analysis.proto.ProtoShrinker):269:269 -> a
     29:29:void lambda$write$1(com.android.tools.r8.dex.ApplicationWriter$SortAnnotations,com.android.tools.r8.graph.DexProgramClass):274:274 -> a
     30:34:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):285:289 -> a
-    35:35:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():444:444 -> a
+    35:35:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():445:445 -> a
     35:35:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):289 -> a
     36:43:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):292:299 -> a
-    44:44:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():440:440 -> a
+    44:44:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():441:441 -> a
     44:44:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):299 -> a
     45:47:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):303:305 -> a
     48:52:java.lang.Boolean lambda$write$2(com.android.tools.r8.dex.VirtualFile):304:308 -> a
@@ -13269,7 +13275,7 @@
     37:42:void write(java.util.concurrent.ExecutorService):265:270 -> c
     43:56:void write(java.util.concurrent.ExecutorService):268:281 -> c
     57:116:void write(java.util.concurrent.ExecutorService):280:339 -> c
-    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> c
+    117:117:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> c
     117:117:void write(java.util.concurrent.ExecutorService):339 -> c
     118:126:void write(java.util.concurrent.ExecutorService):339:347 -> c
 com.android.tools.r8.dex.ApplicationWriter$1 -> com.android.tools.r8.dex.b$a:
@@ -13312,7 +13318,7 @@
     1:1:int getUleb128():44:44 -> e
     1:1:int getUleb128p1():52 -> e
     1:2:int getUshort():62:63 -> f
-com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.p6:
+com.android.tools.r8.dex.ClassesChecksum -> com.android.tools.r8.internal.t6:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap dictionary -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -13334,7 +13340,7 @@
     1:1:boolean com.android.tools.r8.naming.NamingLens.hasPrefixRewritingLogic():0:0 -> a
     1:1:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24 -> a
     2:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):24:25 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     4:4:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):26 -> a
     5:7:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:29 -> a
     void generateKeepRules(com.android.tools.r8.utils.InternalOptions) -> a
@@ -13366,9 +13372,9 @@
     27:66:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):149:188 -> a
     1:3:java.lang.String convertType(com.android.tools.r8.graph.DexType):141:143 -> b
     1:1:void keepClass(com.android.tools.r8.graph.DexType):131:131 -> c
-    2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):400:407 -> c
+    2:9:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):405:412 -> c
     2:9:void keepClass(com.android.tools.r8.graph.DexType):131 -> c
-    10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):405:409 -> c
+    10:14:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.lookupBaseType(com.android.tools.r8.graph.DexItemFactory):410:414 -> c
     10:14:void keepClass(com.android.tools.r8.graph.DexType):131 -> c
     15:15:void keepClass(com.android.tools.r8.graph.DexType):132:132 -> c
     1:8:boolean shouldKeep(com.android.tools.r8.graph.DexType):70:77 -> d
@@ -13387,7 +13393,7 @@
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:1:void generateKeepRules(com.android.tools.r8.utils.InternalOptions):216:216 -> a
-com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.S6:
+com.android.tools.r8.dex.CompatByteBuffer -> com.android.tools.r8.internal.X6:
     java.nio.ByteBuffer buffer -> a
     1:2:void <init>(java.nio.ByteBuffer):21:22 -> <init>
     1:1:java.nio.ByteBuffer com.android.tools.r8.dex.CompatByteBuffer.asByteBuffer():34:34 -> a
@@ -13455,12 +13461,12 @@
     1:1:java.nio.Buffer com.android.tools.r8.dex.CompatByteBuffer.asBuffer():30:30 -> m
     1:1:void rewind():48 -> m
     2:2:void rewind():48:48 -> m
-com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.i7:
+com.android.tools.r8.dex.Constants -> com.android.tools.r8.internal.n7:
     byte[] VDEX_FILE_MAGIC_PREFIX -> b
     byte[] DEX_FILE_MAGIC_PREFIX -> a
     com.android.tools.r8.cf.CfVersion CORRESPONDING_CLASS_FILE_VERSION -> c
     1:12:void <clinit>():10:21 -> <clinit>
-com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.C7:
+com.android.tools.r8.dex.DebugBytecodeWriter -> com.android.tools.r8.internal.H7:
     com.android.tools.r8.graph.ObjectToOffsetMapping mapping -> a
     com.android.tools.r8.graph.DexDebugInfo info -> b
     java.nio.ByteBuffer buffer -> c
@@ -13595,118 +13601,118 @@
     560:653:void com.android.tools.r8.dex.BinaryReader.align(int):0:93 -> a
     560:653:void ensureCodesInited(int):162 -> a
     560:653:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    654:666:com.android.tools.r8.graph.DexCode parseCodeItem():881:893 -> a
+    654:666:com.android.tools.r8.graph.DexCode parseCodeItem():882:894 -> a
     654:666:void ensureCodesInited(int):163 -> a
     654:666:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     667:667:short com.android.tools.r8.dex.BinaryReader.getShort():68:68 -> a
-    667:667:com.android.tools.r8.graph.DexCode parseCodeItem():893 -> a
+    667:667:com.android.tools.r8.graph.DexCode parseCodeItem():894 -> a
     667:667:void ensureCodesInited(int):163 -> a
     667:667:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    668:683:com.android.tools.r8.graph.DexCode parseCodeItem():893:908 -> a
+    668:683:com.android.tools.r8.graph.DexCode parseCodeItem():894:909 -> a
     668:683:void ensureCodesInited(int):163 -> a
     668:683:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     684:684:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    684:684:com.android.tools.r8.graph.DexCode parseCodeItem():908 -> a
+    684:684:com.android.tools.r8.graph.DexCode parseCodeItem():909 -> a
     684:684:void ensureCodesInited(int):163 -> a
     684:684:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    685:685:com.android.tools.r8.graph.DexCode parseCodeItem():910:910 -> a
+    685:685:com.android.tools.r8.graph.DexCode parseCodeItem():911:911 -> a
     685:685:void ensureCodesInited(int):163 -> a
     685:685:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     686:730:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    686:730:com.android.tools.r8.graph.DexCode parseCodeItem():910 -> a
+    686:730:com.android.tools.r8.graph.DexCode parseCodeItem():911 -> a
     686:730:void ensureCodesInited(int):163 -> a
     686:730:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    731:735:com.android.tools.r8.graph.DexCode parseCodeItem():911:915 -> a
+    731:735:com.android.tools.r8.graph.DexCode parseCodeItem():912:916 -> a
     731:735:void ensureCodesInited(int):163 -> a
     731:735:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     736:736:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    736:736:com.android.tools.r8.graph.DexCode parseCodeItem():915 -> a
+    736:736:com.android.tools.r8.graph.DexCode parseCodeItem():916 -> a
     736:736:void ensureCodesInited(int):163 -> a
     736:736:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    737:739:com.android.tools.r8.graph.DexCode parseCodeItem():916:918 -> a
+    737:739:com.android.tools.r8.graph.DexCode parseCodeItem():917:919 -> a
     737:739:void ensureCodesInited(int):163 -> a
     737:739:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     740:788:int com.android.tools.r8.dex.BinaryReader.getSleb128():0:48 -> a
-    740:788:com.android.tools.r8.graph.DexCode parseCodeItem():918 -> a
+    740:788:com.android.tools.r8.graph.DexCode parseCodeItem():919 -> a
     740:788:void ensureCodesInited(int):163 -> a
     740:788:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    789:793:com.android.tools.r8.graph.DexCode parseCodeItem():919:923 -> a
+    789:793:com.android.tools.r8.graph.DexCode parseCodeItem():920:924 -> a
     789:793:void ensureCodesInited(int):163 -> a
     789:793:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     794:838:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    794:838:com.android.tools.r8.graph.DexCode parseCodeItem():923 -> a
+    794:838:com.android.tools.r8.graph.DexCode parseCodeItem():924 -> a
     794:838:void ensureCodesInited(int):163 -> a
     794:838:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    839:839:com.android.tools.r8.graph.DexCode parseCodeItem():924:924 -> a
+    839:839:com.android.tools.r8.graph.DexCode parseCodeItem():925:925 -> a
     839:839:void ensureCodesInited(int):163 -> a
     839:839:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     840:884:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    840:884:com.android.tools.r8.graph.DexCode parseCodeItem():924 -> a
+    840:884:com.android.tools.r8.graph.DexCode parseCodeItem():925 -> a
     840:884:void ensureCodesInited(int):163 -> a
     840:884:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    885:889:com.android.tools.r8.graph.DexCode parseCodeItem():925:929 -> a
+    885:889:com.android.tools.r8.graph.DexCode parseCodeItem():926:930 -> a
     885:889:void ensureCodesInited(int):163 -> a
     885:889:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     890:934:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    890:934:com.android.tools.r8.graph.DexCode parseCodeItem():929 -> a
+    890:934:com.android.tools.r8.graph.DexCode parseCodeItem():930 -> a
     890:934:void ensureCodesInited(int):163 -> a
     890:934:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    935:938:com.android.tools.r8.graph.DexCode parseCodeItem():931:934 -> a
+    935:938:com.android.tools.r8.graph.DexCode parseCodeItem():932:935 -> a
     935:938:void ensureCodesInited(int):163 -> a
     935:938:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     939:939:void com.android.tools.r8.graph.DexCode$Try.setHandlerIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):473:473 -> a
-    939:939:com.android.tools.r8.graph.DexCode parseCodeItem():935 -> a
+    939:939:com.android.tools.r8.graph.DexCode parseCodeItem():936 -> a
     939:939:void ensureCodesInited(int):163 -> a
     939:939:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    940:940:com.android.tools.r8.graph.DexCode parseCodeItem() -> a
+    940:940:com.android.tools.r8.graph.DexCode parseCodeItem():941:941 -> a
     940:940:void ensureCodesInited(int):163 -> a
     940:940:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     941:941:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    941:941:com.android.tools.r8.graph.DexCode parseCodeItem():940 -> a
+    941:941:com.android.tools.r8.graph.DexCode parseCodeItem():941 -> a
     941:941:void ensureCodesInited(int):163 -> a
     941:941:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    942:947:com.android.tools.r8.graph.DexCode parseCodeItem():941:946 -> a
+    942:947:com.android.tools.r8.graph.DexCode parseCodeItem() -> a
     942:947:void ensureCodesInited(int):163 -> a
     942:947:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
     948:949:void ensureCodesInited(int):164:165 -> a
     948:949:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):672 -> a
-    950:955:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):673:678 -> a
-    956:1204:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):0:248 -> a
-    956:1204:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):678 -> a
-    1205:1212:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):680:687 -> a
-    1213:1220:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):686:693 -> a
-    1221:1240:void addClassDefsTo(java.util.function.Consumer):700:719 -> a
-    1241:1241:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
-    1241:1241:void addClassDefsTo(java.util.function.Consumer):719 -> a
-    1242:1242:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1242:1242:void addClassDefsTo(java.util.function.Consumer):719 -> a
-    1243:1245:void addClassDefsTo(java.util.function.Consumer):721:723 -> a
-    1246:1246:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    1246:1246:void addClassDefsTo(java.util.function.Consumer):723 -> a
-    1247:1249:void addClassDefsTo(java.util.function.Consumer):723:725 -> a
-    1250:1250:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
-    1250:1250:void addClassDefsTo(java.util.function.Consumer):725 -> a
-    1251:1288:void addClassDefsTo(java.util.function.Consumer):725:762 -> a
-    1289:1333:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    1289:1333:void addClassDefsTo(java.util.function.Consumer):762 -> a
-    1334:1334:void addClassDefsTo(java.util.function.Consumer):763:763 -> a
-    1335:1379:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    1335:1379:void addClassDefsTo(java.util.function.Consumer):763 -> a
-    1380:1380:void addClassDefsTo(java.util.function.Consumer):764:764 -> a
-    1381:1425:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    1381:1425:void addClassDefsTo(java.util.function.Consumer):764 -> a
-    1426:1426:void addClassDefsTo(java.util.function.Consumer):765:765 -> a
-    1427:1471:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
-    1427:1471:void addClassDefsTo(java.util.function.Consumer):765 -> a
-    1472:1474:void addClassDefsTo(java.util.function.Consumer):767:767 -> a
-    1476:1518:void addClassDefsTo(java.util.function.Consumer):769:811 -> a
-    1519:1539:void addClassDefsTo(java.util.function.Consumer):793:813 -> a
-    1540:1540:void addClassDefsTo(java.util.function.Consumer):741:741 -> a
-    1541:1541:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1541:1541:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1541:1541:void addClassDefsTo(java.util.function.Consumer):741 -> a
-    1542:1542:void addClassDefsTo(java.util.function.Consumer):741:741 -> a
-    1543:1543:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):790:790 -> a
+    950:956:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):673:679 -> a
+    957:1205:java.lang.String com.android.tools.r8.graph.DexAnnotation.getSignature(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory):0:248 -> a
+    957:1205:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):679 -> a
+    1206:1213:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):681:688 -> a
+    1214:1221:com.android.tools.r8.graph.DexEncodedMethod[] readMethods(int,com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[],boolean):687:694 -> a
+    1222:1241:void addClassDefsTo(java.util.function.Consumer):701:720 -> a
+    1242:1242:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> a
+    1242:1242:void addClassDefsTo(java.util.function.Consumer):720 -> a
+    1243:1243:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1243:1243:void addClassDefsTo(java.util.function.Consumer):720 -> a
+    1244:1246:void addClassDefsTo(java.util.function.Consumer):722:724 -> a
+    1247:1247:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    1247:1247:void addClassDefsTo(java.util.function.Consumer):724 -> a
+    1248:1250:void addClassDefsTo(java.util.function.Consumer):724:726 -> a
+    1251:1251:int com.android.tools.r8.dex.BinaryReader.getInt():78:78 -> a
+    1251:1251:void addClassDefsTo(java.util.function.Consumer):726 -> a
+    1252:1289:void addClassDefsTo(java.util.function.Consumer):726:763 -> a
+    1290:1334:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    1290:1334:void addClassDefsTo(java.util.function.Consumer):763 -> a
+    1335:1335:void addClassDefsTo(java.util.function.Consumer):764:764 -> a
+    1336:1380:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    1336:1380:void addClassDefsTo(java.util.function.Consumer):764 -> a
+    1381:1381:void addClassDefsTo(java.util.function.Consumer):765:765 -> a
+    1382:1426:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    1382:1426:void addClassDefsTo(java.util.function.Consumer):765 -> a
+    1427:1427:void addClassDefsTo(java.util.function.Consumer):766:766 -> a
+    1428:1472:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> a
+    1428:1472:void addClassDefsTo(java.util.function.Consumer):766 -> a
+    1473:1475:void addClassDefsTo(java.util.function.Consumer):768:768 -> a
+    1477:1519:void addClassDefsTo(java.util.function.Consumer):770:812 -> a
+    1520:1540:void addClassDefsTo(java.util.function.Consumer):794:814 -> a
+    1541:1541:void addClassDefsTo(java.util.function.Consumer):742:742 -> a
+    1542:1542:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1542:1542:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1542:1542:void addClassDefsTo(java.util.function.Consumer):742 -> a
+    1543:1543:void addClassDefsTo(java.util.function.Consumer):742:742 -> a
+    1544:1544:long lambda$addClassDefsTo$0(java.lang.Long,com.android.tools.r8.graph.DexProgramClass):791:791 -> a
     1:2:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():458:459 -> b
     3:3:int com.android.tools.r8.dex.BinaryReader.position():82:82 -> b
     3:3:com.android.tools.r8.graph.DexAnnotationSet parseAnnotationSet():459 -> b
@@ -13808,7 +13814,7 @@
     141:144:com.android.tools.r8.graph.DexEncodedAnnotation parseEncodedAnnotation():315:318 -> f
     145:145:com.android.tools.r8.graph.DexEncodedArray encodedArrayAt(int):336:336 -> f
     1:1:com.android.tools.r8.graph.DexEncodedArray parseEncodedArray():332:332 -> g
-    2:8:com.android.tools.r8.dex.DexSection lookupSection(int):830:836 -> g
+    2:8:com.android.tools.r8.dex.DexSection lookupSection(int):831:837 -> g
     1:3:com.android.tools.r8.graph.DexTypeList typeListAt(int):179:181 -> h
     4:4:com.android.tools.r8.graph.DexValue[] parseEncodedArrayValues():322:322 -> h
     5:49:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> h
@@ -13872,155 +13878,155 @@
     259:260:com.android.tools.r8.graph.DexValue parseEncodedValue():204:205 -> i
     261:262:com.android.tools.r8.graph.DexValue parseEncodedValue():198:199 -> i
     263:265:com.android.tools.r8.graph.DexValue parseEncodedValue():191:193 -> i
-    1:10:com.android.tools.r8.dex.DexSection[] parseMap():841:850 -> j
+    1:10:com.android.tools.r8.dex.DexSection[] parseMap():842:851 -> j
     11:11:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    11:11:com.android.tools.r8.dex.DexSection[] parseMap():850 -> j
-    12:12:com.android.tools.r8.dex.DexSection[] parseMap():863:863 -> j
-    13:16:com.android.tools.r8.dex.DexSection[] parseMap():851:854 -> j
+    11:11:com.android.tools.r8.dex.DexSection[] parseMap():851 -> j
+    12:12:com.android.tools.r8.dex.DexSection[] parseMap():864:864 -> j
+    13:16:com.android.tools.r8.dex.DexSection[] parseMap():852:855 -> j
     17:17:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    17:17:com.android.tools.r8.dex.DexSection[] parseMap():860 -> j
-    18:18:com.android.tools.r8.dex.DexSection[] parseMap():860:860 -> j
+    17:17:com.android.tools.r8.dex.DexSection[] parseMap():861 -> j
+    18:18:com.android.tools.r8.dex.DexSection[] parseMap():861:861 -> j
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> j
     19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> j
-    19:19:com.android.tools.r8.dex.DexSection[] parseMap():860 -> j
-    20:30:com.android.tools.r8.dex.DexSection[] parseMap():860:870 -> j
-    31:36:com.android.tools.r8.dex.DexSection[] parseMap():869:874 -> j
+    19:19:com.android.tools.r8.dex.DexSection[] parseMap():861 -> j
+    20:30:com.android.tools.r8.dex.DexSection[] parseMap():861:871 -> j
+    31:36:com.android.tools.r8.dex.DexSection[] parseMap():870:875 -> j
     37:37:void com.android.tools.r8.dex.DexSection.setEnd(int):0:0 -> j
-    37:37:com.android.tools.r8.dex.DexSection[] parseMap():874 -> j
-    38:38:com.android.tools.r8.dex.DexSection[] parseMap():876:876 -> j
+    37:37:com.android.tools.r8.dex.DexSection[] parseMap():875 -> j
+    38:38:com.android.tools.r8.dex.DexSection[] parseMap():877:877 -> j
     39:39:int com.android.tools.r8.dex.BinaryReader.end():107:107 -> j
-    39:39:com.android.tools.r8.dex.DexSection[] parseMap():876 -> j
+    39:39:com.android.tools.r8.dex.DexSection[] parseMap():877 -> j
     40:40:void com.android.tools.r8.dex.DexSection.setEnd(int):0:0 -> j
-    40:40:com.android.tools.r8.dex.DexSection[] parseMap():876 -> j
-    1:8:void parseStringIDs():818:825 -> k
+    40:40:com.android.tools.r8.dex.DexSection[] parseMap():877 -> j
+    1:8:void parseStringIDs():819:826 -> k
     1:5:com.android.tools.r8.graph.DexTypeList parseTypeList():170:174 -> l
-    1:3:void populateStrings():962:964 -> m
-    1:3:void populateIndexTables():951 -> m
-    4:6:com.android.tools.r8.graph.DexString stringAt(int):1188:1190 -> m
-    4:6:void populateStrings():964 -> m
-    4:6:void populateIndexTables():951 -> m
+    1:3:void populateStrings():963:965 -> m
+    1:3:void populateIndexTables():952 -> m
+    4:6:com.android.tools.r8.graph.DexString stringAt(int):1189:1191 -> m
+    4:6:void populateStrings():965 -> m
+    4:6:void populateIndexTables():952 -> m
     7:51:int com.android.tools.r8.dex.BinaryReader.getUleb128():0:44 -> m
-    7:51:com.android.tools.r8.graph.DexString stringAt(int):1190 -> m
-    7:51:void populateStrings():964 -> m
-    7:51:void populateIndexTables():951 -> m
-    52:55:com.android.tools.r8.graph.DexString stringAt(int):1191:1194 -> m
-    52:55:void populateStrings():964 -> m
-    52:55:void populateIndexTables():951 -> m
+    7:51:com.android.tools.r8.graph.DexString stringAt(int):1191 -> m
+    7:51:void populateStrings():965 -> m
+    7:51:void populateIndexTables():952 -> m
+    52:55:com.android.tools.r8.graph.DexString stringAt(int):1192:1195 -> m
+    52:55:void populateStrings():965 -> m
+    52:55:void populateIndexTables():952 -> m
     56:56:byte com.android.tools.r8.dex.BinaryReader.get():97:97 -> m
-    56:56:com.android.tools.r8.graph.DexString stringAt(int):1194 -> m
-    56:56:void populateStrings():964 -> m
-    56:56:void populateIndexTables():951 -> m
-    57:59:com.android.tools.r8.graph.DexString stringAt(int):1195:1197 -> m
-    57:59:void populateStrings():964 -> m
-    57:59:void populateIndexTables():951 -> m
-    60:60:void populateStrings():964:964 -> m
-    60:60:void populateIndexTables():951 -> m
-    61:69:void populateChecksums():994:1002 -> m
-    61:69:void populateIndexTables():952 -> m
-    70:71:void populateTypes():985:986 -> m
-    70:71:void populateIndexTables():953 -> m
-    72:91:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1011:1030 -> m
-    72:91:void populateTypes():986 -> m
-    72:91:void populateIndexTables():953 -> m
-    92:92:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1025:1025 -> m
-    92:92:void populateTypes():986 -> m
-    92:92:void populateIndexTables():953 -> m
-    93:95:void populateTypes():987:989 -> m
-    93:95:void populateIndexTables():953 -> m
-    96:102:com.android.tools.r8.graph.DexType typeAt(int):1201:1207 -> m
-    96:102:void populateTypes():989 -> m
-    96:102:void populateIndexTables():953 -> m
-    103:103:void populateTypes():989:989 -> m
-    103:103:void populateIndexTables():953 -> m
-    104:105:void populateFields():1039:1040 -> m
-    104:105:void populateIndexTables():954 -> m
-    106:141:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1055:1090 -> m
-    106:141:void populateFields():1040 -> m
-    106:141:void populateIndexTables():954 -> m
-    142:152:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1087:1097 -> m
-    142:152:void populateFields():1040 -> m
-    142:152:void populateIndexTables():954 -> m
-    153:157:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1094:1098 -> m
-    153:157:void populateFields():1040 -> m
-    153:157:void populateIndexTables():954 -> m
-    158:158:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1083:1083 -> m
-    158:158:void populateFields():1040 -> m
-    158:158:void populateIndexTables():954 -> m
-    159:161:void populateFields():1041:1043 -> m
-    159:161:void populateIndexTables():954 -> m
-    162:174:com.android.tools.r8.graph.DexField fieldAt(int):1211:1223 -> m
-    162:174:void populateFields():1043 -> m
-    162:174:void populateIndexTables():954 -> m
-    175:175:void populateFields():1043:1043 -> m
-    175:175:void populateIndexTables():954 -> m
-    176:179:void populateProtos():1109:1112 -> m
-    176:179:void populateIndexTables():955 -> m
-    180:192:com.android.tools.r8.graph.DexProto protoAt(int):1284:1296 -> m
-    180:192:void populateProtos():1112 -> m
-    180:192:void populateIndexTables():955 -> m
-    193:193:void populateProtos():1112:1112 -> m
-    193:193:void populateIndexTables():955 -> m
-    194:195:void populateMethods():1117:1118 -> m
-    194:195:void populateIndexTables():956 -> m
-    196:231:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1134:1169 -> m
-    196:231:void populateMethods():1118 -> m
-    196:231:void populateIndexTables():956 -> m
-    232:242:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1166:1176 -> m
-    232:242:void populateMethods():1118 -> m
-    232:242:void populateIndexTables():956 -> m
-    243:247:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1173:1177 -> m
-    243:247:void populateMethods():1118 -> m
-    243:247:void populateIndexTables():956 -> m
-    248:248:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1162:1162 -> m
-    248:248:void populateMethods():1118 -> m
-    248:248:void populateIndexTables():956 -> m
-    249:251:void populateMethods():1119:1121 -> m
-    249:251:void populateIndexTables():956 -> m
-    252:264:com.android.tools.r8.graph.DexMethod methodAt(int):1300:1312 -> m
-    252:264:void populateMethods():1121 -> m
-    252:264:void populateIndexTables():956 -> m
-    265:265:com.android.tools.r8.graph.DexMethod methodAt(int):1309:1309 -> m
-    265:265:void populateMethods():1121 -> m
-    265:265:void populateIndexTables():956 -> m
-    266:266:void populateMethods():1121:1121 -> m
-    266:266:void populateIndexTables():956 -> m
-    267:270:void populateMethodHandles():969:972 -> m
-    267:270:void populateIndexTables():957 -> m
-    271:298:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1227:1254 -> m
-    271:298:void populateMethodHandles():972 -> m
-    271:298:void populateIndexTables():957 -> m
-    299:299:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1250:1250 -> m
-    299:299:void populateMethodHandles():972 -> m
-    299:299:void populateIndexTables():957 -> m
-    300:316:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1242:1258 -> m
-    300:316:void populateMethodHandles():972 -> m
-    300:316:void populateIndexTables():957 -> m
-    317:317:void populateMethodHandles():972:972 -> m
-    317:317:void populateIndexTables():957 -> m
-    318:321:void populateCallSites():977:980 -> m
-    318:321:void populateIndexTables():958 -> m
-    322:330:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1263:1271 -> m
-    322:330:void populateCallSites():980 -> m
-    322:330:void populateIndexTables():958 -> m
+    56:56:com.android.tools.r8.graph.DexString stringAt(int):1195 -> m
+    56:56:void populateStrings():965 -> m
+    56:56:void populateIndexTables():952 -> m
+    57:59:com.android.tools.r8.graph.DexString stringAt(int):1196:1198 -> m
+    57:59:void populateStrings():965 -> m
+    57:59:void populateIndexTables():952 -> m
+    60:60:void populateStrings():965:965 -> m
+    60:60:void populateIndexTables():952 -> m
+    61:69:void populateChecksums():995:1003 -> m
+    61:69:void populateIndexTables():953 -> m
+    70:71:void populateTypes():986:987 -> m
+    70:71:void populateIndexTables():954 -> m
+    72:91:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1012:1031 -> m
+    72:91:void populateTypes():987 -> m
+    72:91:void populateIndexTables():954 -> m
+    92:92:boolean verifyOrderOfTypeIds(com.android.tools.r8.dex.DexSection):1026:1026 -> m
+    92:92:void populateTypes():987 -> m
+    92:92:void populateIndexTables():954 -> m
+    93:95:void populateTypes():988:990 -> m
+    93:95:void populateIndexTables():954 -> m
+    96:102:com.android.tools.r8.graph.DexType typeAt(int):1202:1208 -> m
+    96:102:void populateTypes():990 -> m
+    96:102:void populateIndexTables():954 -> m
+    103:103:void populateTypes():990:990 -> m
+    103:103:void populateIndexTables():954 -> m
+    104:105:void populateFields():1040:1041 -> m
+    104:105:void populateIndexTables():955 -> m
+    106:141:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1056:1091 -> m
+    106:141:void populateFields():1041 -> m
+    106:141:void populateIndexTables():955 -> m
+    142:152:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1088:1098 -> m
+    142:152:void populateFields():1041 -> m
+    142:152:void populateIndexTables():955 -> m
+    153:157:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1095:1099 -> m
+    153:157:void populateFields():1041 -> m
+    153:157:void populateIndexTables():955 -> m
+    158:158:boolean verifyOrderOfFieldIds(com.android.tools.r8.dex.DexSection):1084:1084 -> m
+    158:158:void populateFields():1041 -> m
+    158:158:void populateIndexTables():955 -> m
+    159:161:void populateFields():1042:1044 -> m
+    159:161:void populateIndexTables():955 -> m
+    162:174:com.android.tools.r8.graph.DexField fieldAt(int):1212:1224 -> m
+    162:174:void populateFields():1044 -> m
+    162:174:void populateIndexTables():955 -> m
+    175:175:void populateFields():1044:1044 -> m
+    175:175:void populateIndexTables():955 -> m
+    176:179:void populateProtos():1110:1113 -> m
+    176:179:void populateIndexTables():956 -> m
+    180:192:com.android.tools.r8.graph.DexProto protoAt(int):1285:1297 -> m
+    180:192:void populateProtos():1113 -> m
+    180:192:void populateIndexTables():956 -> m
+    193:193:void populateProtos():1113:1113 -> m
+    193:193:void populateIndexTables():956 -> m
+    194:195:void populateMethods():1118:1119 -> m
+    194:195:void populateIndexTables():957 -> m
+    196:231:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1135:1170 -> m
+    196:231:void populateMethods():1119 -> m
+    196:231:void populateIndexTables():957 -> m
+    232:242:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1167:1177 -> m
+    232:242:void populateMethods():1119 -> m
+    232:242:void populateIndexTables():957 -> m
+    243:247:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1174:1178 -> m
+    243:247:void populateMethods():1119 -> m
+    243:247:void populateIndexTables():957 -> m
+    248:248:boolean verifyOrderOfMethodIds(com.android.tools.r8.dex.DexSection):1163:1163 -> m
+    248:248:void populateMethods():1119 -> m
+    248:248:void populateIndexTables():957 -> m
+    249:251:void populateMethods():1120:1122 -> m
+    249:251:void populateIndexTables():957 -> m
+    252:264:com.android.tools.r8.graph.DexMethod methodAt(int):1301:1313 -> m
+    252:264:void populateMethods():1122 -> m
+    252:264:void populateIndexTables():957 -> m
+    265:265:com.android.tools.r8.graph.DexMethod methodAt(int):1310:1310 -> m
+    265:265:void populateMethods():1122 -> m
+    265:265:void populateIndexTables():957 -> m
+    266:266:void populateMethods():1122:1122 -> m
+    266:266:void populateIndexTables():957 -> m
+    267:270:void populateMethodHandles():970:973 -> m
+    267:270:void populateIndexTables():958 -> m
+    271:298:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1228:1255 -> m
+    271:298:void populateMethodHandles():973 -> m
+    271:298:void populateIndexTables():958 -> m
+    299:299:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1251:1251 -> m
+    299:299:void populateMethodHandles():973 -> m
+    299:299:void populateIndexTables():958 -> m
+    300:316:com.android.tools.r8.graph.DexMethodHandle methodHandleAt(int):1243:1259 -> m
+    300:316:void populateMethodHandles():973 -> m
+    300:316:void populateIndexTables():958 -> m
+    317:317:void populateMethodHandles():973:973 -> m
+    317:317:void populateIndexTables():958 -> m
+    318:321:void populateCallSites():978:981 -> m
+    318:321:void populateIndexTables():959 -> m
+    322:330:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1264:1272 -> m
+    322:330:void populateCallSites():981 -> m
+    322:330:void populateIndexTables():959 -> m
     331:331:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> m
-    331:331:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1271 -> m
-    331:331:void populateCallSites():980 -> m
-    331:331:void populateIndexTables():958 -> m
-    332:334:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1271:1273 -> m
-    332:334:void populateCallSites():980 -> m
-    332:334:void populateIndexTables():958 -> m
+    331:331:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1272 -> m
+    331:331:void populateCallSites():981 -> m
+    331:331:void populateIndexTables():959 -> m
+    332:334:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1272:1274 -> m
+    332:334:void populateCallSites():981 -> m
+    332:334:void populateIndexTables():959 -> m
     335:335:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodType():0:0 -> m
-    335:335:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1273 -> m
-    335:335:void populateCallSites():980 -> m
-    335:335:void populateIndexTables():958 -> m
-    336:343:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1273:1280 -> m
-    336:343:void populateCallSites():980 -> m
-    336:343:void populateIndexTables():958 -> m
-    344:344:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1275:1275 -> m
-    344:344:void populateCallSites():980 -> m
-    344:344:void populateIndexTables():958 -> m
-    345:345:void populateCallSites():980:980 -> m
-    345:345:void populateIndexTables():958 -> m
+    335:335:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1274 -> m
+    335:335:void populateCallSites():981 -> m
+    335:335:void populateIndexTables():959 -> m
+    336:343:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1274:1281 -> m
+    336:343:void populateCallSites():981 -> m
+    336:343:void populateIndexTables():959 -> m
+    344:344:com.android.tools.r8.graph.DexCallSite callSiteAt(int):1276:1276 -> m
+    344:344:void populateCallSites():981 -> m
+    344:344:void populateIndexTables():959 -> m
+    345:345:void populateCallSites():981:981 -> m
+    345:345:void populateIndexTables():959 -> m
 com.android.tools.r8.dex.DexParser$1 -> com.android.tools.r8.dex.j$a:
 com.android.tools.r8.dex.DexParser$AnnotationsDirectory -> com.android.tools.r8.dex.j$b:
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] methods -> g
@@ -14031,9 +14037,9 @@
     com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[] NO_METHOD_ANNOTATIONS -> c
     com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[] fields -> f
     com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[] NO_PARAMETER_ANNOTATIONS -> a
-    1:11:void <clinit>():1317:1327 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1339:1343 -> <init>
-    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1347:1347 -> a
+    1:11:void <clinit>():1318:1328 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexMemberAnnotation$DexFieldAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexMethodAnnotation[],com.android.tools.r8.graph.DexMemberAnnotation$DexParameterAnnotation[]):1340:1344 -> <init>
+    1:1:com.android.tools.r8.dex.DexParser$AnnotationsDirectory empty():1348:1348 -> a
 com.android.tools.r8.dex.DexParser$AttributesAndAnnotations -> com.android.tools.r8.dex.j$c:
     com.android.tools.r8.graph.DexAnnotationSet originalAnnotations -> b
     java.util.List lazyAnnotations -> e
@@ -14041,18 +14047,18 @@
     com.android.tools.r8.graph.EnclosingMethodAttribute enclosingMethodAttribute -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.GenericSignature$ClassSignature classSignature -> f
-    1:1:void <clinit>():1351:1351 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1386:1386 -> <init>
-    2:56:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1354:1408 -> <init>
-    57:72:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1407:1422 -> <init>
-    73:110:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1421:1458 -> <init>
-    111:126:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1453:1468 -> <init>
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$100(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1351:1351 -> a
-    2:8:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1360:1366 -> a
-    9:11:void ensureAnnotations(int):1474:1476 -> a
-    12:13:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1481:1482 -> a
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1374:1374 -> b
-    1:1:java.util.List getInnerClasses():1370:1370 -> c
+    1:1:void <clinit>():1352:1352 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1387:1387 -> <init>
+    2:56:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1355:1409 -> <init>
+    57:72:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1408:1423 -> <init>
+    73:110:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1422:1459 -> <init>
+    111:126:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):1454:1469 -> <init>
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature access$100(com.android.tools.r8.dex.DexParser$AttributesAndAnnotations):1352:1352 -> a
+    2:8:com.android.tools.r8.graph.DexAnnotationSet getAnnotations():1361:1367 -> a
+    9:11:void ensureAnnotations(int):1475:1477 -> a
+    12:13:void copyAnnotation(com.android.tools.r8.graph.DexAnnotation):1482:1483 -> a
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():1375:1375 -> b
+    1:1:java.util.List getInnerClasses():1371:1371 -> c
 com.android.tools.r8.dex.DexParser$MemberAnnotationIterator -> com.android.tools.r8.dex.j$d:
     java.util.function.Supplier emptyValue -> c
     com.android.tools.r8.graph.DexMemberAnnotation[] annotations -> b
@@ -14087,7 +14093,7 @@
     8:8:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> h
     8:8:void setByteOrder():83 -> h
     9:9:void setByteOrder():83:83 -> h
-com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.J8:
+com.android.tools.r8.dex.DexSection -> com.android.tools.r8.internal.R8:
     int offset -> d
     boolean $assertionsDisabled -> a
     int type -> b
@@ -14497,7 +14503,7 @@
     1:2:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1369:1370 -> <init>
     3:7:void <init>(com.android.tools.r8.dex.FileWriter,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexProgramClass[]):1367:1371 -> <init>
     1:4:void visit(com.android.tools.r8.graph.DexClass):1382:1385 -> b
-com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.td:
+com.android.tools.r8.dex.IndexedItemCollection -> com.android.tools.r8.internal.Fd:
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
@@ -14556,7 +14562,7 @@
     102:102:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):458 -> a
     103:106:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):461:464 -> a
     107:107:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):453:453 -> a
-    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    108:108:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
     108:108:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454 -> a
     109:109:java.util.Collection assignClassesWithLinkingError(java.util.Set,java.util.Collection):454:454 -> a
     110:110:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -14585,7 +14591,7 @@
     169:169:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     169:169:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):713 -> a
     170:174:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):714:718 -> a
-    175:175:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    175:175:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     175:175:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):718 -> a
     176:177:com.android.tools.r8.graph.DexProgramClass findOneRootInSetFrom(com.android.tools.r8.graph.DexProgramClass,java.util.Set):719:720 -> a
     178:178:boolean isDexFull(com.android.tools.r8.dex.VirtualFile):731:731 -> a
@@ -14624,7 +14630,7 @@
     111:111:void markDexFull(com.android.tools.r8.dex.VirtualFile):727:727 -> b
     111:111:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):654 -> b
     112:112:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):648:648 -> b
-    113:113:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
+    113:113:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> b
     113:113:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649 -> b
     114:114:java.util.Set assignFromRoot(com.android.tools.r8.dex.VirtualFile,java.util.Collection):649:649 -> b
     115:115:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
@@ -14694,7 +14700,7 @@
     2:5:void addDirectSubClass(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):274:277 -> a
     6:7:java.util.Collection getDirectSubClasses(com.android.tools.r8.graph.DexProgramClass):262:263 -> a
     1:1:java.util.Collection lambda$addDirectSubClass$0(com.android.tools.r8.graph.DexProgramClass):276:276 -> b
-com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.jh:
+com.android.tools.r8.dex.JumboStringRewriter -> com.android.tools.r8.internal.wh:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.graph.DexString firstJumboString -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap tryRangeStartAndEndTargets -> i
@@ -14766,7 +14772,7 @@
     407:417:com.android.tools.r8.graph.DexCode rewrite():121 -> a
     418:430:com.android.tools.r8.graph.DexCode rewrite():123:135 -> a
     com.android.tools.r8.code.Instruction lambda$replaceTarget$1(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction) -> b
-com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.jh$a:
+com.android.tools.r8.dex.JumboStringRewriter$TryTargets -> com.android.tools.r8.internal.wh$a:
     com.android.tools.r8.code.Instruction start -> b
     com.android.tools.r8.code.Instruction end -> c
     boolean $assertionsDisabled -> a
@@ -14776,7 +14782,7 @@
     1:5:void replaceTarget(com.android.tools.r8.code.Instruction,com.android.tools.r8.code.Instruction):71:75 -> a
     6:6:int getStartOffset():80:80 -> a
     1:4:int getStartToEndDelta():84:87 -> b
-com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.On:
+com.android.tools.r8.dex.Marker -> com.android.tools.r8.internal.ao:
     com.android.tools.r8.com.google.gson.JsonObject jsonObject -> e
     com.android.tools.r8.dex.Marker$Tool tool -> f
     java.lang.String D8_PREFIX -> a
@@ -14827,12 +14833,12 @@
     1:1:boolean isL8():124:124 -> n
     1:1:boolean isRelocator():128:128 -> o
     1:5:java.lang.String toString():258:262 -> toString
-com.android.tools.r8.dex.Marker$Backend -> com.android.tools.r8.internal.On$a:
+com.android.tools.r8.dex.Marker$Backend -> com.android.tools.r8.internal.ao$a:
     com.android.tools.r8.dex.Marker$Backend DEX -> b
     com.android.tools.r8.dex.Marker$Backend CF -> a
     1:2:void <clinit>():47:48 -> <clinit>
     1:1:void <init>(java.lang.String,int):46:46 -> <init>
-com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.On$b:
+com.android.tools.r8.dex.Marker$Tool -> com.android.tools.r8.internal.ao$b:
     com.android.tools.r8.dex.Marker$Tool R8 -> b
     com.android.tools.r8.dex.Marker$Tool D8 -> a
     com.android.tools.r8.dex.Marker$Tool Relocator -> d
@@ -14840,7 +14846,7 @@
     1:4:void <clinit>():36:39 -> <clinit>
     1:1:void <init>(java.lang.String,int):35:35 -> <init>
     1:1:com.android.tools.r8.dex.Marker$Tool[] valuesR8andD8():42:42 -> a
-com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.Ko:
+com.android.tools.r8.dex.MethodToCodeObjectMapping -> com.android.tools.r8.internal.Wo:
     1:1:void <init>():12:12 -> <init>
     void clearCode(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     com.android.tools.r8.graph.DexCode getCode(com.android.tools.r8.graph.DexEncodedMethod) -> a
@@ -14876,7 +14882,7 @@
     1:1:com.android.tools.r8.dex.MethodToCodeObjectMapping com.android.tools.r8.dex.MethodToCodeObjectMapping.fromMethodBacking():21:21 -> a
     1:1:void visit(com.android.tools.r8.graph.DexEncodedMethod):63 -> a
     2:2:void visit(com.android.tools.r8.graph.DexEncodedMethod):62:62 -> a
-com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.hx:
+com.android.tools.r8.dex.ResourceAdapter -> com.android.tools.r8.internal.Ax:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.naming.NamingLens namingLens -> d
@@ -14903,14 +14909,14 @@
     56:64:boolean shouldAdapt(com.android.tools.r8.DataEntryResource,com.android.tools.r8.utils.InternalOptions,java.util.function.Function):96:104 -> a
     1:1:com.android.tools.r8.graph.GraphLens access$100(com.android.tools.r8.dex.ResourceAdapter):32:32 -> b
     1:1:com.android.tools.r8.naming.NamingLens access$200(com.android.tools.r8.dex.ResourceAdapter):32:32 -> c
-com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.bx:
+com.android.tools.r8.dex.ResourceAdapter$DefaultFileNameAdapter -> com.android.tools.r8.internal.ux:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):419:419 -> <init>
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> b
     1:1:boolean isRenamingCandidate(int,int):424 -> b
-com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.cx:
+com.android.tools.r8.dex.ResourceAdapter$DirectoryNameAdapter -> com.android.tools.r8.internal.vx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):451:451 -> <init>
     boolean isRenamingCandidate(int,int) -> b
-com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.dx:
+com.android.tools.r8.dex.ResourceAdapter$FileContentsAdapter -> com.android.tools.r8.internal.wx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):353:353 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean shouldRecordPrefix(char):368:368 -> a
@@ -14920,7 +14926,7 @@
     2:2:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> b
     2:2:boolean isRenamingCandidate(int,int):380 -> b
     3:3:boolean isRenamingCandidate(int,int):380:380 -> b
-com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.ex:
+com.android.tools.r8.dex.ResourceAdapter$FileNameAdapter -> com.android.tools.r8.internal.xx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):390:390 -> <init>
     boolean allowRenamingOfPrefixes() -> a
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> a
@@ -14929,12 +14935,12 @@
     6:6:boolean handlePrefix(int,int):411:411 -> a
     7:7:boolean shouldRecordPrefix(char):405:405 -> a
     char getClassNameSeparator() -> b
-com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.fx:
+com.android.tools.r8.dex.ResourceAdapter$ServiceFileNameAdapter -> com.android.tools.r8.internal.yx:
     1:1:void <init>(com.android.tools.r8.dex.ResourceAdapter,java.lang.String):430:430 -> <init>
     char getClassNameSeparator() -> b
     1:1:boolean com.android.tools.r8.dex.ResourceAdapter$StringAdapter.eof(int):346:346 -> b
     1:1:boolean isRenamingCandidate(int,int):445 -> b
-com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.gx:
+com.android.tools.r8.dex.ResourceAdapter$StringAdapter -> com.android.tools.r8.internal.zx:
     int position -> f
     com.android.tools.r8.dex.ResourceAdapter this$0 -> h
     int outputFrom -> e
@@ -15444,7 +15450,7 @@
     1:1:int getCodeSize():32:32 -> getCodeSize
     1:5:java.lang.String getDiagnosticMessage():42:46 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():37:37 -> getPosition
-com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.T6:
+com.android.tools.r8.errors.CompilationError -> com.android.tools.r8.internal.Y6:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:1:void <init>(java.lang.String):22:22 -> <init>
@@ -15461,14 +15467,14 @@
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.references.ClassReference,int):21:23 -> <init>
     1:1:int getConstantPoolSize():28:28 -> getConstantPoolSize
     1:5:java.lang.String getDiagnosticMessage():33:37 -> getDiagnosticMessage
-com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Q7:
+com.android.tools.r8.errors.DefaultInterfaceMethodDiagnostic -> com.android.tools.r8.internal.V7:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.k8:
+com.android.tools.r8.errors.DesugaredLibraryMismatchDiagnostic -> com.android.tools.r8.internal.p8:
     java.util.Set desugaredLibraryIdentifiers -> a
     1:2:void <init>(java.util.Set):16:17 -> <init>
     1:1:java.lang.String getDiagnosticMessage():32:32 -> getDiagnosticMessage
@@ -15511,14 +15517,14 @@
     1:1:com.android.tools.r8.references.ClassReference getMissingType():58:58 -> getMissingType
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():53:53 -> getPosition
-com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.dg:
+com.android.tools.r8.errors.InternalCompilerError -> com.android.tools.r8.internal.qg:
     1:1:void <init>():17:17 -> <init>
     2:2:void <init>(java.lang.String):21:21 -> <init>
     3:3:void <init>(java.lang.String,java.lang.Throwable):25:25 -> <init>
     4:4:void <init>(java.lang.Throwable):29:29 -> <init>
-com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.kg:
+com.android.tools.r8.errors.InvalidDebugInfoException -> com.android.tools.r8.internal.xg:
     1:1:void <init>(java.lang.String):9:9 -> <init>
-com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.lg:
+com.android.tools.r8.errors.InvalidDescriptorException -> com.android.tools.r8.internal.yg:
     1:1:void <init>(java.lang.String):8:8 -> <init>
 com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic -> com.android.tools.r8.errors.InvalidLibrarySuperclassDiagnostic:
     com.android.tools.r8.references.ClassReference invalidSuperType -> e
@@ -15532,7 +15538,7 @@
     1:13:java.lang.String getDiagnosticMessage():57:69 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():52:52 -> getPosition
-com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.pg:
+com.android.tools.r8.errors.InvokeCustomDiagnostic -> com.android.tools.r8.internal.Cg:
     1:1:void <init>():9:9 -> <init>
     1:1:java.lang.String getDiagnosticMessage():13:13 -> getDiagnosticMessage
 com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic -> com.android.tools.r8.errors.MissingNestHostNestDesugarDiagnostic:
@@ -15545,24 +15551,24 @@
     1:1:java.lang.String getDiagnosticMessage():36:36 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():26:26 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():31:31 -> getPosition
-com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.bt:
+com.android.tools.r8.errors.PrivateInterfaceMethodDiagnostic -> com.android.tools.r8.internal.wt:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.Ky:
+com.android.tools.r8.errors.StaticInterfaceMethodDiagnostic -> com.android.tools.r8.internal.dz:
     com.android.tools.r8.position.MethodPosition position -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:3:void <init>(com.android.tools.r8.position.MethodPosition):15:17 -> <init>
     1:3:java.lang.String getDiagnosticMessage():27:27 -> getDiagnosticMessage
     1:1:com.android.tools.r8.position.Position getPosition():22:22 -> getPosition
-com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.TB:
+com.android.tools.r8.errors.Unimplemented -> com.android.tools.r8.internal.oC:
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
-com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.fC:
+com.android.tools.r8.errors.Unreachable -> com.android.tools.r8.internal.AC:
     1:1:void <init>():11:11 -> <init>
     2:2:void <init>(java.lang.String):15:15 -> <init>
     3:3:void <init>(java.lang.Throwable):19:19 -> <init>
@@ -15591,7 +15597,7 @@
     1:1:com.android.tools.r8.references.FieldReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Lb:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo -> com.android.tools.r8.internal.Ub:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo UNKNOWN -> a
     boolean $assertionsDisabled -> b
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind kind -> c
@@ -15603,7 +15609,7 @@
     1:1:boolean equals(java.lang.Object):103:103 -> equals
     1:1:int hashCode():108:108 -> hashCode
     1:1:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Lb$a:
+com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind -> com.android.tools.r8.internal.Ub$a:
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind[] $VALUES -> u
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind Unknown -> t
     com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind ReachableFromLiveType -> m
@@ -15667,34 +15673,34 @@
     1:1:com.android.tools.r8.references.MethodReference getReference():21:21 -> getReference
     1:1:int hashCode():32:32 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.b6:
+com.android.tools.r8.features.ClassToFeatureSplitMap -> com.android.tools.r8.internal.f6:
     java.util.Map classToFeatureSplitMap -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():24:24 -> <clinit>
-    1:1:void <init>():28:28 -> <init>
-    2:2:void <init>():26:26 -> <init>
-    1:1:com.android.tools.r8.features.ClassToFeatureSplitMap createEmptyClassToFeatureSplitMap():31:31 -> a
-    2:21:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):41:60 -> a
-    22:26:java.util.Map getFeatureSplitClasses(java.util.Set):69:73 -> a
-    27:27:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):73:73 -> a
-    28:28:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexProgramClass):80:80 -> a
-    29:29:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.DexType):84:84 -> a
-    29:29:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexProgramClass):80 -> a
-    30:30:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexType):84:84 -> a
-    31:31:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):109:109 -> a
-    32:33:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.GraphLens):113:114 -> a
-    34:43:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):116:125 -> a
-    44:45:void lambda$withoutPrunedClasses$2(java.util.Set,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):134:135 -> a
-    1:1:boolean isEmpty():88:88 -> b
-    2:2:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> b
-    2:2:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> b
-    3:4:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedClasses(java.util.Set):131:132 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.la:
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <init>():29:29 -> <init>
+    2:2:void <init>():27:27 -> <init>
+    1:1:com.android.tools.r8.features.ClassToFeatureSplitMap createEmptyClassToFeatureSplitMap():32:32 -> a
+    2:21:com.android.tools.r8.features.ClassToFeatureSplitMap createInitialClassToFeatureSplitMap(com.android.tools.r8.utils.InternalOptions):42:61 -> a
+    22:26:java.util.Map getFeatureSplitClasses(java.util.Set):70:74 -> a
+    27:27:java.util.Set lambda$getFeatureSplitClasses$0(com.android.tools.r8.FeatureSplit):74:74 -> a
+    28:28:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):81:81 -> a
+    29:29:com.android.tools.r8.FeatureSplit com.android.tools.r8.features.ClassToFeatureSplitMap.getFeatureSplit(com.android.tools.r8.graph.DexType):85:85 -> a
+    29:29:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.ProgramDefinition):81 -> a
+    30:30:com.android.tools.r8.FeatureSplit getFeatureSplit(com.android.tools.r8.graph.DexType):85:85 -> a
+    31:31:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
+    31:31:boolean isInFeature(com.android.tools.r8.graph.DexProgramClass):102 -> a
+    32:32:boolean isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):110:110 -> a
+    33:34:com.android.tools.r8.features.ClassToFeatureSplitMap rewrittenWithLens(com.android.tools.r8.graph.GraphLens):114:115 -> a
+    35:44:void lambda$rewrittenWithLens$1(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):117:126 -> a
+    45:46:void lambda$withoutPrunedClasses$2(java.util.Set,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.graph.DexType,com.android.tools.r8.FeatureSplit):135:136 -> a
+    1:1:boolean isEmpty():89:89 -> b
+    2:3:com.android.tools.r8.features.ClassToFeatureSplitMap withoutPrunedClasses(java.util.Set):132:133 -> b
+com.android.tools.r8.features.FeatureSplitConfiguration -> com.android.tools.r8.internal.ua:
     java.util.List featureSplits -> a
     1:2:void <init>(java.util.List):20:21 -> <init>
     1:16:java.util.Collection getDataResourceProvidersAndConsumers():44:59 -> a
     1:1:java.util.List getFeatureSplits():68:68 -> b
-com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.la$a:
+com.android.tools.r8.features.FeatureSplitConfiguration$DataResourceProvidersAndConsumer -> com.android.tools.r8.internal.ua$a:
     com.android.tools.r8.DataResourceConsumer consumer -> b
     java.util.Set providers -> a
     1:3:void <init>(java.util.Set,com.android.tools.r8.DataResourceConsumer):29:31 -> <init>
@@ -15764,16 +15770,16 @@
     boolean isEmpty() -> c
 com.android.tools.r8.graph.AccessControl -> com.android.tools.r8.internal.Q0:
     1:1:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):21:21 -> a
-    2:12:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):62:72 -> a
-    13:16:boolean com.android.tools.r8.graph.AccessControl.isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):91:94 -> a
-    13:16:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):72 -> a
-    17:28:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:84 -> a
-    29:29:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
+    2:12:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):61:71 -> a
+    13:16:boolean com.android.tools.r8.graph.AccessControl.isNestMate(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):90:93 -> a
+    13:16:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):71 -> a
+    17:28:com.android.tools.r8.utils.OptionalBool isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):72:83 -> a
+    29:29:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> a
     29:29:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):26 -> a
-    30:35:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):26:31 -> a
-    36:37:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):96:97 -> a
-    36:37:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):30 -> a
-    38:40:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):32:34 -> a
+    30:34:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):26:30 -> a
+    35:36:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):97:98 -> a
+    35:36:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):30 -> a
+    37:39:com.android.tools.r8.utils.OptionalBool isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.features.ClassToFeatureSplitMap):31:33 -> a
 com.android.tools.r8.graph.AccessFlags -> com.android.tools.r8.graph.a:
     java.util.List NAMES -> a
     int modifiedFlags -> d
@@ -15831,6 +15837,13 @@
     1:1:void setStatic():179:179 -> x
     1:1:void setSynthetic():203:203 -> y
     1:1:java.lang.String toSmaliString():270:270 -> z
+com.android.tools.r8.graph.AccessFlags$BuilderBase -> com.android.tools.r8.graph.a$a:
+    com.android.tools.r8.graph.AccessFlags flags -> b
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():295:295 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AccessFlags):299:300 -> <init>
+    com.android.tools.r8.graph.AccessFlags$BuilderBase self() -> a
+    1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setPackagePrivate():304:305 -> b
 com.android.tools.r8.graph.AppInfo -> com.android.tools.r8.graph.b:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.DexApplication app -> b
@@ -15859,7 +15872,7 @@
     20:20:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):151 -> a
     21:21:com.android.tools.r8.graph.DexClass definitionForDesugarDependency(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):151:151 -> a
     22:25:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):194:197 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):422:422 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):436:436 -> a
     26:26:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):197 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):198:198 -> a
     28:28:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):230:230 -> a
@@ -15870,7 +15883,7 @@
     34:34:com.android.tools.r8.graph.FieldResolutionResult resolveFieldOn(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):237 -> a
     1:2:com.android.tools.r8.graph.DexApplication app():88:89 -> b
     3:6:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):175:178 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):422:422 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupDirectMethod(com.android.tools.r8.graph.DexMethod):436:436 -> b
     7:7:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):178 -> b
     8:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTargetOnItself(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):179:179 -> b
     1:1:boolean checkIfObsolete():83:83 -> c
@@ -15922,7 +15935,7 @@
     99:103:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):324:328 -> a
     104:116:java.util.List computeChainInClassHierarchy(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):326:338 -> a
     117:123:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):357:363 -> a
-    124:124:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):176:176 -> a
+    124:124:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):180:180 -> a
     124:124:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):363 -> a
     125:125:boolean methodDefinedInInterface(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):363:363 -> a
     126:126:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):105:105 -> a
@@ -15946,21 +15959,21 @@
     170:170:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):642:642 -> a
     170:170:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):593 -> a
     171:171:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606:606 -> a
-    172:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):461:467 -> a
+    172:178:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):475:481 -> a
     172:178:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
-    179:180:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):483:484 -> a
-    179:180:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):474 -> a
+    179:180:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):497:498 -> a
+    179:180:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):488 -> a
     179:180:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
     181:181:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> a
-    181:181:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():138 -> a
-    181:181:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):484 -> a
-    181:181:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):474 -> a
+    181:181:boolean com.android.tools.r8.graph.MethodAccessFlags.isVarargs():147 -> a
+    181:181:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):498 -> a
+    181:181:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):488 -> a
     181:181:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
-    182:184:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):484:486 -> a
-    182:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):474 -> a
+    182:184:boolean com.android.tools.r8.graph.DexClass.isSignaturePolymorphicMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexItemFactory):498:500 -> a
+    182:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupSignaturePolymorphicMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):488 -> a
     182:184:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):606 -> a
     185:185:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):608:608 -> a
-    186:186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
+    186:186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> a
     186:186:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):611 -> a
     187:196:com.android.tools.r8.graph.ResolutionResult resolveMethodOnClassStep2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):618:627 -> a
     197:197:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):647:647 -> a
@@ -15974,7 +15987,7 @@
     202:204:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificMethod(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.DexMethod):386 -> a
     205:207:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):662:662 -> a
     208:214:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):671:677 -> a
-    215:215:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
+    215:215:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> a
     215:215:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):678 -> a
     216:216:boolean isMaximallySpecificCandidate(com.android.tools.r8.graph.DexEncodedMethod):702:702 -> a
     216:216:void resolveMethodStep3Helper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.graph.AppInfoWithClassHierarchy$MaximallySpecificMethodsBuilder):679 -> a
@@ -16003,10 +16016,10 @@
     28:29:com.android.tools.r8.graph.DexEncodedMethod lookupDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):480 -> c
     30:39:com.android.tools.r8.graph.ResolutionResult unsafeResolveMethodDueToDexFormat(com.android.tools.r8.graph.DexMethod):494:503 -> c
     40:41:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):739:740 -> c
-    42:42:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> c
+    42:42:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> c
     42:42:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):742 -> c
     43:48:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):744:749 -> c
-    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> c
+    49:49:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> c
     49:49:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):751 -> c
     50:51:com.android.tools.r8.graph.ResolutionResult resolveMethodOnInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):752:753 -> c
     52:52:com.android.tools.r8.graph.ResolutionResult resolveMethodStep3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):640:640 -> c
@@ -16023,7 +16036,7 @@
     7:8:com.android.tools.r8.graph.DexEncodedMethod lookupStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):440 -> d
     1:17:java.util.Set implementedInterfaces(com.android.tools.r8.graph.DexType):252:268 -> f
     1:1:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):246:246 -> g
-    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):618:622 -> g
+    2:6:boolean com.android.tools.r8.graph.DexClass.hasMissingSuperType(com.android.tools.r8.graph.AppInfoWithClassHierarchy):636:640 -> g
     2:6:boolean isMissingOrHasMissingSuperType(com.android.tools.r8.graph.DexType):247 -> g
     1:1:boolean hasClassHierarchy():102:102 -> h
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy withClassHierarchy():108:108 -> n
@@ -16058,12 +16071,12 @@
     5:12:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):73:80 -> a
     13:23:java.util.List serviceImplementationsFor(com.android.tools.r8.graph.DexType):76:86 -> a
     24:41:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):91:108 -> a
-    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
-    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> a
+    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
+    42:42:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):102 -> a
     42:42:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109 -> a
     43:44:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):112:113 -> a
-    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
-    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> a
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
+    45:45:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):102 -> a
     45:45:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):114 -> a
     46:48:boolean hasServiceImplementationsInFeature(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):97:99 -> a
     49:61:com.android.tools.r8.graph.AppServices rewrittenWithLens(com.android.tools.r8.graph.GraphLens):123:135 -> a
@@ -16137,142 +16150,146 @@
     boolean allCodeProcessed -> r
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():48:48 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):97:97 -> <init>
-    2:59:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):64:121 -> <init>
-    1:1:com.android.tools.r8.graph.EnumValueInfoMapCollection unboxedEnums():493:493 -> A
-    1:4:boolean validateUnboxedEnumsHaveBeenPruned():503:506 -> B
-    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():483:483 -> C
-    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():514:514 -> D
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):98:98 -> <init>
+    2:59:void <init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.AppView$WholeProgramOptimizations,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):65:122 -> <init>
+    1:1:com.android.tools.r8.graph.EnumValueInfoMapCollection unboxedEnums():501:501 -> A
+    1:4:boolean validateUnboxedEnumsHaveBeenPruned():511:514 -> B
+    1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses verticallyMergedClasses():491:491 -> C
+    1:1:com.android.tools.r8.graph.AppView withClassHierarchy():522:522 -> D
     com.android.tools.r8.graph.AppView withLiveness() -> E
-    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):136:136 -> a
-    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):131:132 -> a
-    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):137 -> a
-    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):137:137 -> a
-    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):142:142 -> a
-    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):146:146 -> a
-    7:13:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):151:157 -> a
-    7:13:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):146 -> a
-    14:20:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):151:157 -> a
-    21:21:void setAppServices(com.android.tools.r8.graph.AppServices):236:236 -> a
-    22:22:void setClassesEscapingIntoLibrary(java.util.function.Predicate):245:245 -> a
-    23:23:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):249:249 -> a
-    24:24:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):253:253 -> a
-    25:25:com.android.tools.r8.graph.DexItemFactory dexItemFactory():277:277 -> a
-    26:27:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):320:321 -> a
-    28:29:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):327:328 -> a
-    30:31:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):369:370 -> a
-    30:31:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):607 -> a
-    32:51:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):608:627 -> a
-    52:56:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):626:630 -> a
-    57:58:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):369:370 -> a
-    59:59:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):389:389 -> a
-    60:60:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):394:394 -> a
-    61:61:void setCfByteCodePassThrough(java.util.Set):398:398 -> a
-    62:63:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):422:423 -> a
-    64:65:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):457:458 -> a
-    66:66:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():414:414 -> a
-    66:66:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):459 -> a
-    67:69:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):459:461 -> a
-    70:71:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):473:474 -> a
-    72:72:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():414:414 -> a
-    72:72:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):475 -> a
-    73:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):475:475 -> a
-    74:75:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):487:488 -> a
-    76:76:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():414:414 -> a
-    76:76:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):489 -> a
-    77:77:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):489:489 -> a
-    78:79:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):497:498 -> a
-    80:80:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():414:414 -> a
-    80:80:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):499 -> a
-    81:81:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):499:499 -> a
-    82:84:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):529:531 -> a
-    85:85:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):535:535 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    86:86:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):535 -> a
-    87:91:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):538:542 -> a
-    92:92:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set):551:551 -> a
-    93:96:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):558:561 -> a
-    97:104:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):569:576 -> a
-    97:104:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):560 -> a
-    105:105:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):573:573 -> a
-    105:105:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):560 -> a
-    106:106:com.android.tools.r8.graph.AppServices appServices():232:232 -> a
-    106:106:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):577 -> a
-    106:106:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):560 -> a
-    107:107:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):577:577 -> a
-    107:107:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):560 -> a
-    108:108:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):582:582 -> a
-    109:109:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):588:588 -> a
-    110:112:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):593:595 -> a
-    113:113:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):633:633 -> a
-    114:114:com.android.tools.r8.graph.AppServices appServices():232:232 -> a
-    114:114:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):634 -> a
-    115:115:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):634:634 -> a
-    116:116:boolean hasInitClassLens():385:385 -> a
-    116:116:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):635 -> a
-    117:117:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):636:636 -> a
-    118:118:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):389:389 -> a
-    118:118:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):636 -> a
-    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):162:162 -> b
-    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):166:166 -> b
-    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):131:132 -> b
-    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):167 -> b
-    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):167:167 -> b
-    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():171:171 -> b
-    7:8:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):342:343 -> b
-    9:10:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):357:358 -> b
-    1:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):131:132 -> c
-    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
-    4:5:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):335:336 -> c
-    6:7:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):349:350 -> c
-    8:13:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():431:436 -> c
-    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):127:127 -> d
-    2:3:com.android.tools.r8.graph.AppInfo appInfo():183:184 -> d
-    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):204:206 -> d
-    7:7:void unsetAppInfoForDesugaring():200:200 -> d
-    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):207 -> d
-    8:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):209:212 -> d
-    12:13:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):306:307 -> d
-    14:15:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):403:404 -> d
-    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():188:196 -> e
-    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):240:241 -> e
-    12:13:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):312:313 -> e
-    1:1:com.android.tools.r8.graph.AppServices appServices():232:232 -> f
-    2:5:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):262:265 -> f
-    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):258:258 -> f
-    6:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):266 -> f
-    7:11:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):268:272 -> f
-    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():289:289 -> g
-    1:1:boolean canUseInitClass():377:377 -> h
+    1:1:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):137:137 -> a
+    2:3:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):132:133 -> a
+    2:3:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):138 -> a
+    4:4:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo):138:138 -> a
+    5:5:com.android.tools.r8.graph.AppView createForD8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):143:143 -> a
+    6:6:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):147:147 -> a
+    7:13:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):152:158 -> a
+    7:13:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication):147 -> a
+    14:20:com.android.tools.r8.graph.AppView createForR8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses):152:158 -> a
+    21:21:void setAppServices(com.android.tools.r8.graph.AppServices):237:237 -> a
+    22:22:void setClassesEscapingIntoLibrary(java.util.function.Predicate):246:246 -> a
+    23:23:void setSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexValue$DexValueString):250:250 -> a
+    24:24:com.android.tools.r8.graph.DexValue$DexValueString getSourceDebugExtensionForType(com.android.tools.r8.graph.DexClass):254:254 -> a
+    25:25:com.android.tools.r8.graph.DexItemFactory dexItemFactory():278:278 -> a
+    26:27:void withGeneratedExtensionRegistryShrinker(com.android.tools.r8.utils.ThrowingConsumer):328:329 -> a
+    28:29:java.lang.Object withGeneratedExtensionRegistryShrinker(java.util.function.Function,java.lang.Object):335:336 -> a
+    30:31:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):377:378 -> a
+    30:31:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):615 -> a
+    32:51:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):616:635 -> a
+    52:56:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):634:638 -> a
+    57:58:boolean setGraphLens(com.android.tools.r8.graph.GraphLens):377:378 -> a
+    59:59:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):397:397 -> a
+    60:60:void setInitializedClassesInInstanceMethods(com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):402:402 -> a
+    61:61:void setCfByteCodePassThrough(java.util.Set):406:406 -> a
+    62:63:void setRootSet(com.android.tools.r8.shaking.RootSetBuilder$RootSet):430:431 -> a
+    64:65:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):465:466 -> a
+    66:66:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():422:422 -> a
+    66:66:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):467 -> a
+    67:69:void setHorizontallyMergedLambdaClasses(com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses):467:469 -> a
+    70:71:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):481:482 -> a
+    72:72:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():422:422 -> a
+    72:72:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):483 -> a
+    73:73:void setHorizontallyMergedClasses(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses):483:483 -> a
+    74:75:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):495:496 -> a
+    76:76:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():422:422 -> a
+    76:76:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):497 -> a
+    77:77:void setVerticallyMergedClasses(com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):497:497 -> a
+    78:79:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):505:506 -> a
+    80:80:com.android.tools.r8.utils.InternalOptions$TestingOptions testing():422:422 -> a
+    80:80:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):507 -> a
+    81:81:void setUnboxedEnums(com.android.tools.r8.graph.EnumValueInfoMapCollection):507:507 -> a
+    82:84:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):537:539 -> a
+    85:85:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):543:543 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    86:86:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):543 -> a
+    87:91:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):546:550 -> a
+    92:92:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set):559:559 -> a
+    93:96:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):566:569 -> a
+    97:104:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):577:584 -> a
+    97:104:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):568 -> a
+    105:105:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):581:581 -> a
+    105:105:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):568 -> a
+    106:106:com.android.tools.r8.graph.AppServices appServices():233:233 -> a
+    106:106:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):585 -> a
+    106:106:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):568 -> a
+    107:107:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection,com.android.tools.r8.graph.AppView):585:585 -> a
+    107:107:void removePrunedClasses(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):568 -> a
+    108:108:void rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):590:590 -> a
+    109:109:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):596:596 -> a
+    110:112:void rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens):601:603 -> a
+    113:113:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):641:641 -> a
+    114:114:com.android.tools.r8.graph.AppServices appServices():233:233 -> a
+    114:114:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):642 -> a
+    115:115:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):642:642 -> a
+    116:116:boolean hasInitClassLens():393:393 -> a
+    116:116:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):643 -> a
+    117:117:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):644:644 -> a
+    118:118:void setInitClassLens(com.android.tools.r8.graph.InitClassLens):397:397 -> a
+    118:118:void lambda$rewriteWithLens$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):644 -> a
+    1:1:com.android.tools.r8.graph.AppView createForL8(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):163:163 -> b
+    2:2:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):167:167 -> b
+    3:4:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):132:133 -> b
+    3:4:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):168 -> b
+    5:5:com.android.tools.r8.graph.AppView createForRelocator(com.android.tools.r8.graph.AppInfo):168:168 -> b
+    6:6:com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory():172:172 -> b
+    7:8:void withGeneratedMessageLiteBuilderShrinker(com.android.tools.r8.utils.ThrowingConsumer):350:351 -> b
+    9:10:java.lang.Object withGeneratedMessageLiteBuilderShrinker(java.util.function.Function,java.lang.Object):365:366 -> b
+    1:2:com.android.tools.r8.ir.desugar.PrefixRewritingMapper defaultPrefixRewritingMapper(com.android.tools.r8.graph.AppInfo):132:133 -> c
+    3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
+    4:5:void withGeneratedMessageLiteShrinker(com.android.tools.r8.utils.ThrowingConsumer):343:344 -> c
+    6:7:java.lang.Object withGeneratedMessageLiteShrinker(java.util.function.Function,java.lang.Object):357:358 -> c
+    8:13:com.android.tools.r8.graph.classmerging.MergedClassesCollection allMergedClasses():439:444 -> c
+    1:1:boolean isModeled(com.android.tools.r8.graph.DexType):128:128 -> d
+    2:3:com.android.tools.r8.graph.AppInfo appInfo():184:185 -> d
+    4:6:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):205:207 -> d
+    7:7:void unsetAppInfoForDesugaring():201:201 -> d
+    7:7:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):208 -> d
+    8:11:com.android.tools.r8.graph.AppView setAppInfo(com.android.tools.r8.graph.AppInfo):210:213 -> d
+    12:13:void withProtoShrinker(com.android.tools.r8.utils.ThrowingConsumer):307:308 -> d
+    14:15:java.lang.Object withInitializedClassesInInstanceMethods(java.util.function.Function,java.lang.Object):411:412 -> d
+    1:9:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfoForDesugaring():189:197 -> e
+    10:11:boolean isClassEscapingIntoLibrary(com.android.tools.r8.graph.DexType):241:242 -> e
+    12:12:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):320:320 -> e
+    13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isProtoEnumShrinkingEnabled():1242:1242 -> e
+    13:13:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):320 -> e
+    14:14:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):321:321 -> e
+    1:1:com.android.tools.r8.graph.AppServices appServices():233:233 -> f
+    2:5:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):263:266 -> f
+    6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):259:259 -> f
+    6:6:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):267 -> f
+    7:11:com.android.tools.r8.utils.OptionalBool isInterface(com.android.tools.r8.graph.DexType):269:273 -> f
+    12:13:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):313:314 -> f
+    1:1:com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator callSiteOptimizationInfoPropagator():290:290 -> g
+    1:1:boolean canUseInitClass():385:385 -> h
     2:2:boolean com.android.tools.r8.graph.InitClassLens.isFinal():0:0 -> h
-    2:2:boolean canUseInitClass():377 -> h
-    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():228:228 -> i
+    2:2:boolean canUseInitClass():385 -> h
+    1:1:com.android.tools.r8.graph.GraphLens clearCodeRewritings():229:229 -> i
     2:3:com.android.tools.r8.graph.GraphLens com.android.tools.r8.graph.GraphLens.withCodeRewritingsApplied(com.android.tools.r8.graph.DexItemFactory):447:448 -> i
-    2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():228 -> i
-    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():228:228 -> i
-    1:1:boolean enableWholeProgramOptimizations():281:281 -> j
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():427:427 -> k
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():297:297 -> l
-    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():285:285 -> m
-    1:1:com.android.tools.r8.graph.GraphLens graphLens():364:364 -> n
-    1:1:boolean hasCfByteCodePassThroughMethods():546:546 -> o
-    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():469:469 -> p
-    1:1:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses():452:452 -> q
-    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():381:381 -> r
-    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():175:175 -> s
-    1:1:boolean isAllCodeProcessed():220:220 -> t
-    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():293:293 -> u
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory():179:179 -> v
-    1:1:com.android.tools.r8.utils.InternalOptions options():410:410 -> w
-    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():301:301 -> x
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():418:418 -> y
-    1:1:void setAllCodeProcessed():224:224 -> z
+    2:3:com.android.tools.r8.graph.GraphLens clearCodeRewritings():229 -> i
+    4:4:com.android.tools.r8.graph.GraphLens clearCodeRewritings():229:229 -> i
+    1:1:boolean enableWholeProgramOptimizations():282:282 -> j
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():435:435 -> k
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection getLibraryMethodSideEffectModelCollection():298:298 -> l
+    1:1:com.android.tools.r8.synthesis.SyntheticItems getSyntheticItems():286:286 -> m
+    1:1:com.android.tools.r8.graph.GraphLens graphLens():372:372 -> n
+    1:1:boolean hasCfByteCodePassThroughMethods():554:554 -> o
+    1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses horizontallyMergedClasses():477:477 -> p
+    1:1:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses horizontallyMergedLambdaClasses():460:460 -> q
+    1:1:com.android.tools.r8.graph.InitClassLens initClassLens():389:389 -> r
+    1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory instanceFieldInitializationInfoFactory():176:176 -> s
+    1:1:boolean isAllCodeProcessed():221:221 -> t
+    1:1:com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer libraryMethodOptimizer():294:294 -> u
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory():180:180 -> v
+    1:1:com.android.tools.r8.utils.InternalOptions options():418:418 -> w
+    1:1:com.android.tools.r8.ir.analysis.proto.ProtoShrinker protoShrinker():302:302 -> x
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet():426:426 -> y
+    1:1:void setAllCodeProcessed():225:225 -> z
 com.android.tools.r8.graph.AppView$WholeProgramOptimizations -> com.android.tools.r8.graph.d$a:
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations ON -> a
     com.android.tools.r8.graph.AppView$WholeProgramOptimizations OFF -> b
-    1:2:void <clinit>():51:52 -> <clinit>
-    1:1:void <init>(java.lang.String,int):50:50 -> <init>
+    1:2:void <clinit>():52:53 -> <clinit>
+    1:1:void <init>(java.lang.String,int):51:51 -> <init>
 com.android.tools.r8.graph.AppliedGraphLens -> com.android.tools.r8.graph.e:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap renamedTypeNames -> g
     boolean $assertionsDisabled -> f
@@ -16315,7 +16332,7 @@
     2:36:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,boolean,boolean,boolean):27:61 -> <init>
     java.lang.String getFileEnding() -> a
     1:8:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):129:136 -> a
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     9:9:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):137 -> a
     10:13:void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream):137:140 -> a
     14:34:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):151:171 -> a
@@ -16326,7 +16343,7 @@
     53:53:void writeAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotationSet,java.io.PrintStream):203:203 -> a
     void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> b
     1:2:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):177:178 -> b
-    3:3:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):380:380 -> b
+    3:3:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter):379:379 -> b
     3:3:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):178 -> b
     4:13:void writeIR(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):179:188 -> b
     1:30:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):72:101 -> c
@@ -16339,7 +16356,7 @@
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):16:17 -> <init>
     1:1:com.android.tools.r8.graph.BottomUpClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):26:26 -> a
     2:14:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):49:61 -> a
-    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     15:15:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):61 -> a
     16:17:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):63:64 -> a
     18:18:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:60 -> a
@@ -16365,199 +16382,199 @@
     java.util.List instructions -> g
     com.android.tools.r8.graph.CfCode$StackMapStatus stackMapStatus -> j
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():65:65 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):146:146 -> <init>
-    2:16:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):138:152 -> <init>
-    1:1:java.util.List getLocalVariables():189:189 -> A
-    1:1:int getMaxLocals():164:164 -> B
-    1:1:int getMaxStack():160:160 -> C
-    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():156:156 -> D
-    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():168:169 -> E
-    1:1:java.util.List getTryCatchRanges():177:177 -> F
-    1:1:boolean shouldComputeInitialFrame():839:839 -> G
+    1:1:void <clinit>():66:66 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):147:147 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.DexType,int,int,java.util.List,java.util.List,java.util.List):139:153 -> <init>
+    1:1:java.util.List getLocalVariables():190:190 -> A
+    1:1:int getMaxLocals():165:165 -> B
+    1:1:int getMaxStack():161:161 -> C
+    1:1:com.android.tools.r8.graph.DexType getOriginalHolder():157:157 -> D
+    1:2:com.android.tools.r8.graph.CfCode$StackMapStatus getStackMapStatus():169:170 -> E
+    1:1:java.util.List getTryCatchRanges():178:178 -> F
+    1:1:boolean shouldComputeInitialFrame():844:844 -> G
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> G
-    2:2:boolean shouldComputeInitialFrame():840 -> G
+    2:2:boolean shouldComputeInitialFrame():845 -> G
     3:3:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> G
-    3:3:boolean shouldComputeInitialFrame():842 -> G
+    3:3:boolean shouldComputeInitialFrame():847 -> G
     4:4:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> G
-    4:4:boolean shouldComputeInitialFrame():842 -> G
-    5:5:boolean shouldComputeInitialFrame():847:847 -> G
-    1:20:int compareTo(com.android.tools.r8.graph.CfCode):233:252 -> a
-    21:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):256:257 -> a
+    4:4:boolean shouldComputeInitialFrame():847 -> G
+    5:5:boolean shouldComputeInitialFrame():852:852 -> G
+    1:20:int compareTo(com.android.tools.r8.graph.CfCode):234:253 -> a
+    21:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):257:258 -> a
     23:23:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    23:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):258 -> a
-    24:24:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):259:259 -> a
-    25:28:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):298:301 -> a
-    29:35:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):300:306 -> a
-    36:52:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):269:285 -> a
-    36:52:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):306 -> a
-    53:53:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):307:307 -> a
+    23:23:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):259 -> a
+    24:24:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap getLabelOrdering(java.util.List):260:260 -> a
+    25:28:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):299:302 -> a
+    29:35:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):301:307 -> a
+    36:52:boolean shouldAddParameterNames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):270:286 -> a
+    36:52:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):307 -> a
+    53:53:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):308:308 -> a
     54:54:void com.android.tools.r8.cf.code.CfLabel.write(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):70:70 -> a
-    54:54:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):308 -> a
-    55:80:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):311:336 -> a
-    81:95:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):330:344 -> a
-    96:102:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):343:349 -> a
-    103:103:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):348:348 -> a
-    104:110:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):361:361 -> a
-    111:112:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):394:395 -> a
-    113:116:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):407:410 -> a
-    117:119:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):409:411 -> a
-    120:134:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):495:509 -> a
-    135:138:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):514:517 -> a
-    139:139:void lambda$registerCodeReferences$6(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch):517:517 -> a
-    140:143:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):522:525 -> a
-    144:144:void lambda$registerCodeReferencesForDesugaring$7(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):525:525 -> a
-    145:185:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):532:572 -> a
-    186:186:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):571:571 -> a
-    187:187:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):543:543 -> a
-    188:216:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):580:608 -> a
-    217:217:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):620:620 -> a
-    218:228:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):628:638 -> a
-    229:229:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
-    229:229:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):638 -> a
-    230:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():271:271 -> a
-    230:230:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):639 -> a
-    231:239:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):640:648 -> a
-    240:246:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):647:653 -> a
-    247:247:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():279:279 -> a
-    247:247:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):656 -> a
-    248:248:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):656:656 -> a
-    249:273:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):662:686 -> a
-    274:275:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):87:88 -> a
-    274:275:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):686 -> a
-    276:276:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):683:683 -> a
-    277:290:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):691:704 -> a
-    291:291:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    291:291:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):704 -> a
-    292:299:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):706:713 -> a
-    300:300:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> a
-    300:300:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):714 -> a
-    301:308:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):715:722 -> a
-    309:344:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:35 -> a
-    309:344:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):720 -> a
-    345:346:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
-    345:346:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):719 -> a
-    347:353:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):726:732 -> a
-    354:380:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:26 -> a
-    354:380:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):731 -> a
-    381:382:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
-    381:382:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):730 -> a
-    383:383:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    383:383:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):738 -> a
-    384:384:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    384:384:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):740 -> a
-    385:390:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):741:746 -> a
-    391:391:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
-    391:391:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):821 -> a
-    391:391:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
-    392:397:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):821:826 -> a
-    392:397:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
-    398:398:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
-    398:398:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):830 -> a
-    398:398:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
-    399:399:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
-    399:399:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):830 -> a
-    399:399:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
-    400:400:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):835:835 -> a
-    400:400:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746 -> a
-    401:404:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):750:753 -> a
-    405:450:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:45 -> a
-    405:450:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):752 -> a
-    451:452:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
-    451:452:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):751 -> a
-    453:475:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):756:778 -> a
-    476:512:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):854:890 -> a
-    476:512:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):780 -> a
-    513:513:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):780:780 -> a
-    514:524:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):778:788 -> a
-    525:525:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    525:525:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
-    526:526:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):0:0 -> a
-    526:526:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
-    527:527:boolean com.android.tools.r8.cf.code.CfInstruction.isConstString():0:0 -> a
-    527:527:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
-    527:527:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
-    528:528:boolean com.android.tools.r8.cf.code.CfInstruction.isDexItemBasedConstString():0:0 -> a
-    528:528:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
-    528:528:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
-    529:529:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):308:308 -> a
-    529:529:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):788 -> a
-    530:530:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):789:789 -> a
-    531:531:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
-    531:531:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):789 -> a
-    532:536:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):789:793 -> a
-    537:546:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):792:801 -> a
-    547:558:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):55:66 -> a
-    547:558:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):796 -> a
-    559:560:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):815:816 -> a
-    559:560:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):795 -> a
-    561:561:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):806:806 -> a
-    562:562:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):693:693 -> a
-    563:563:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):897:897 -> a
-    564:564:boolean lambda$isAssignablePredicate$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):897:897 -> a
-    565:588:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):902:925 -> a
-    589:593:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):924:928 -> a
-    594:595:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):933:934 -> a
-    1:1:void setInstructions(java.util.List):185:185 -> b
-    2:2:int lambda$compareTo$0(com.android.tools.r8.graph.CfCode):234:234 -> b
-    3:5:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):420:422 -> b
-    6:6:void setInstructions(java.util.List):185:185 -> b
-    6:6:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):423 -> b
-    7:9:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):436:438 -> b
-    10:10:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):437:437 -> b
-    11:13:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):462:462 -> b
-    11:13:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):447 -> b
-    23:25:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):472:474 -> b
-    23:25:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):447 -> b
-    26:26:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):473:473 -> b
-    26:26:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):447 -> b
-    1:1:int lambda$compareTo$1(com.android.tools.r8.graph.CfCode):235:235 -> c
-    2:2:boolean computeEquals(java.lang.Object):377:377 -> c
-    1:1:int compareTo(java.lang.Object):65:65 -> compareTo
-    1:1:int lambda$compareTo$2(com.android.tools.r8.graph.CfCode):236:236 -> d
-    1:1:java.util.List lambda$compareTo$3(com.android.tools.r8.graph.CfCode):249:249 -> e
-    1:1:java.util.List lambda$compareTo$4(com.android.tools.r8.graph.CfCode):250:250 -> f
-    1:1:boolean estimatedSizeForInliningAtMost(int):199:199 -> g
-    2:2:java.util.List lambda$compareTo$5(com.android.tools.r8.graph.CfCode):251:251 -> g
-    1:2:int countNonStackOperations(int):209:210 -> h
-    1:1:void setMaxLocals(int):173:173 -> i
-    1:1:int computeHashCode():372:372 -> p
+    54:54:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):309 -> a
+    55:80:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):312:337 -> a
+    81:95:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):331:345 -> a
+    96:102:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):344:350 -> a
+    103:103:void write(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):349:349 -> a
+    104:110:void writeLocalVariableEntry(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,int):362:362 -> a
+    111:112:com.android.tools.r8.ir.code.IRCode buildIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin):395:396 -> a
+    113:116:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):408:411 -> a
+    117:119:com.android.tools.r8.ir.code.IRCode buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):410:412 -> a
+    120:134:com.android.tools.r8.ir.code.IRCode internalBuild(java.util.List,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):496:510 -> a
+    135:140:void registerCodeReferences(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.UseRegistry):515:520 -> a
+    141:141:void lambda$registerCodeReferences$6(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.code.CfTryCatch):520:520 -> a
+    142:147:void registerCodeReferencesForDesugaring(com.android.tools.r8.graph.ClasspathMethod,com.android.tools.r8.graph.UseRegistry):525:530 -> a
+    148:148:void lambda$registerCodeReferencesForDesugaring$7(com.android.tools.r8.graph.UseRegistry,com.android.tools.r8.cf.code.CfTryCatch):530:530 -> a
+    149:189:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):537:577 -> a
+    190:190:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):576:576 -> a
+    191:191:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap collectParameterInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):548:548 -> a
+    192:220:void registerArgumentReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ArgumentUse):585:613 -> a
+    221:221:java.lang.String toString(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.ClassNameMapper):625:625 -> a
+    222:232:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):633:643 -> a
+    233:233:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
+    233:233:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):643 -> a
+    234:234:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMonitor():271:271 -> a
+    234:234:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):644 -> a
+    235:243:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):645:653 -> a
+    244:250:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):652:658 -> a
+    251:251:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forMoveException():279:279 -> a
+    251:251:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):661 -> a
+    252:252:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.ProgramMethod):661:661 -> a
+    253:277:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):667:691 -> a
+    278:279:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):88:89 -> a
+    278:279:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):691 -> a
+    280:280:void addFakeThisParameter(com.android.tools.r8.graph.DexItemFactory):688:688 -> a
+    281:294:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):696:709 -> a
+    295:295:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
+    295:295:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):709 -> a
+    296:303:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):711:718 -> a
+    304:304:boolean com.android.tools.r8.cf.code.CfInstruction.isFrame():0:0 -> a
+    304:304:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):719 -> a
+    305:312:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):720:727 -> a
+    313:348:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.multipleFramesForLabel(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:35 -> a
+    313:348:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):725 -> a
+    349:350:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):820:821 -> a
+    349:350:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):724 -> a
+    351:357:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):731:737 -> a
+    358:384:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.unexpectedStackMapFrame(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:26 -> a
+    358:384:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):736 -> a
+    385:386:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):820:821 -> a
+    385:386:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):735 -> a
+    387:387:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    387:387:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):743 -> a
+    388:388:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    388:388:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):745 -> a
+    389:394:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):746:751 -> a
+    395:395:boolean com.android.tools.r8.cf.code.CfInstruction.isThrow():0:0 -> a
+    395:395:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):826 -> a
+    395:395:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):751 -> a
+    396:401:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):826:831 -> a
+    396:401:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):751 -> a
+    402:402:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    402:402:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):835 -> a
+    402:402:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):751 -> a
+    403:403:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    403:403:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):835 -> a
+    403:403:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):751 -> a
+    404:404:boolean finalAndExitInstruction(com.android.tools.r8.cf.code.CfInstruction):840:840 -> a
+    404:404:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):751 -> a
+    405:408:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):755:758 -> a
+    409:454:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.noFramesForMethodWithJumps(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):0:45 -> a
+    409:454:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):757 -> a
+    455:456:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):820:821 -> a
+    455:456:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):756 -> a
+    457:479:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):761:783 -> a
+    480:516:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap computeInitialLocals(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):859:895 -> a
+    480:516:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):785 -> a
+    517:517:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):785:785 -> a
+    518:528:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):783:793 -> a
+    529:529:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    529:529:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):793 -> a
+    530:530:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):0:0 -> a
+    530:530:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):793 -> a
+    531:531:boolean com.android.tools.r8.cf.code.CfInstruction.isConstString():0:0 -> a
+    531:531:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
+    531:531:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):793 -> a
+    532:532:boolean com.android.tools.r8.cf.code.CfInstruction.isDexItemBasedConstString():0:0 -> a
+    532:532:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):305 -> a
+    532:532:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):793 -> a
+    533:533:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):308:308 -> a
+    533:533:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):793 -> a
+    534:534:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):794:794 -> a
+    535:535:boolean com.android.tools.r8.cf.code.CfInstruction.isStore():0:0 -> a
+    535:535:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):794 -> a
+    536:540:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):794:798 -> a
+    541:550:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):797:806 -> a
+    551:562:com.android.tools.r8.graph.CfCodeDiagnostics com.android.tools.r8.graph.CfCodeStackMapValidatingException.toDiagnostics(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexMethod,int,com.android.tools.r8.cf.code.CfInstruction,java.lang.String,com.android.tools.r8.graph.AppView):55:66 -> a
+    551:562:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):801 -> a
+    563:564:boolean reportStackMapError(com.android.tools.r8.graph.CfCodeDiagnostics,com.android.tools.r8.graph.AppView):820:821 -> a
+    563:564:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):800 -> a
+    565:565:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):811:811 -> a
+    566:566:boolean verifyFrames(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):698:698 -> a
+    567:567:java.util.function.BiPredicate isAssignablePredicate(com.android.tools.r8.graph.AppView):902:902 -> a
+    568:568:boolean lambda$isAssignablePredicate$8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):902:902 -> a
+    569:592:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):907:930 -> a
+    593:597:boolean isAssignable(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):929:933 -> a
+    598:599:com.android.tools.r8.graph.DexType byteCharShortOrBooleanToInt(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):938:939 -> a
+    1:1:void setInstructions(java.util.List):186:186 -> b
+    2:2:int lambda$compareTo$0(com.android.tools.r8.graph.CfCode):235:235 -> b
+    3:5:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):421:423 -> b
+    6:6:void setInstructions(java.util.List):186:186 -> b
+    6:6:void verifyFramesOrRemove(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.origin.Origin,boolean):424 -> b
+    7:9:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):437:439 -> b
+    10:10:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):438:438 -> b
+    11:13:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):463:463 -> b
+    11:13:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):448 -> b
+    23:25:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):473:475 -> b
+    23:25:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):448 -> b
+    26:26:com.android.tools.r8.ir.code.IRCode internalBuildWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):474:474 -> b
+    26:26:com.android.tools.r8.ir.code.IRCode internalBuildPossiblyWithLocals(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):448 -> b
+    1:1:int lambda$compareTo$1(com.android.tools.r8.graph.CfCode):236:236 -> c
+    2:2:boolean computeEquals(java.lang.Object):378:378 -> c
+    1:1:int compareTo(java.lang.Object):66:66 -> compareTo
+    1:1:int lambda$compareTo$2(com.android.tools.r8.graph.CfCode):237:237 -> d
+    1:1:java.util.List lambda$compareTo$3(com.android.tools.r8.graph.CfCode):250:250 -> e
+    1:1:java.util.List lambda$compareTo$4(com.android.tools.r8.graph.CfCode):251:251 -> f
+    1:1:boolean estimatedSizeForInliningAtMost(int):200:200 -> g
+    2:2:java.util.List lambda$compareTo$5(com.android.tools.r8.graph.CfCode):252:252 -> g
+    1:2:int countNonStackOperations(int):210:211 -> h
+    1:1:void setMaxLocals(int):174:174 -> i
+    1:1:int computeHashCode():373:373 -> p
     com.android.tools.r8.graph.CfCode asCfCode() -> q
-    1:1:int estimatedSizeForInlining():194:194 -> t
-    1:1:int estimatedDexCodeSizeUpperBoundInBytes():204 -> t
-    1:1:java.lang.String toString():615:615 -> toString
+    1:1:int estimatedSizeForInlining():195:195 -> t
+    1:1:int estimatedDexCodeSizeUpperBoundInBytes():205 -> t
+    1:1:java.lang.String toString():620:620 -> toString
     2:2:void com.android.tools.r8.cf.CfPrinter.<init>(com.android.tools.r8.graph.CfCode):124:124 -> toString
-    2:2:java.lang.String toString():615 -> toString
-    3:3:java.lang.String toString():615:615 -> toString
-    1:1:int estimatedSizeForInlining():194:194 -> u
+    2:2:java.lang.String toString():620 -> toString
+    3:3:java.lang.String toString():620:620 -> toString
+    1:1:int estimatedSizeForInlining():195:195 -> u
     boolean isCfCode() -> v
-    1:2:boolean isEmptyVoidMethod():382:383 -> x
-    1:1:java.util.List getInstructions():181:181 -> z
+    1:2:boolean isEmptyVoidMethod():383:384 -> x
+    1:1:java.util.List getInstructions():182:182 -> z
 com.android.tools.r8.graph.CfCode$LocalVariableInfo -> com.android.tools.r8.graph.g$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> c
     boolean $assertionsDisabled -> a
     int index -> b
     com.android.tools.r8.cf.code.CfLabel start -> d
     com.android.tools.r8.cf.code.CfLabel end -> e
-    1:1:void <clinit>():73:73 -> <clinit>
-    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):80:83 -> <init>
-    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> a
-    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):92:94 -> a
-    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():110:110 -> a
-    6:10:int compareTo(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCompareHelper):114:118 -> a
-    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> b
-    2:2:int getIndex():98:98 -> b
-    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> c
-    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():102:102 -> c
-    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):73:73 -> d
-    2:2:com.android.tools.r8.cf.code.CfLabel getStart():106:106 -> d
-    1:1:java.lang.String toString():123:123 -> toString
+    1:1:void <clinit>():74:74 -> <clinit>
+    1:4:void <init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel):81:84 -> <init>
+    1:1:com.android.tools.r8.graph.DebugLocalInfo access$000(com.android.tools.r8.graph.CfCode$LocalVariableInfo):74:74 -> a
+    2:4:void setEnd(com.android.tools.r8.cf.code.CfLabel):93:95 -> a
+    5:5:com.android.tools.r8.cf.code.CfLabel getEnd():111:111 -> a
+    6:10:int compareTo(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCompareHelper):115:119 -> a
+    1:1:com.android.tools.r8.cf.code.CfLabel access$100(com.android.tools.r8.graph.CfCode$LocalVariableInfo):74:74 -> b
+    2:2:int getIndex():99:99 -> b
+    1:1:com.android.tools.r8.cf.code.CfLabel access$200(com.android.tools.r8.graph.CfCode$LocalVariableInfo):74:74 -> c
+    2:2:com.android.tools.r8.graph.DebugLocalInfo getLocal():103:103 -> c
+    1:1:int access$300(com.android.tools.r8.graph.CfCode$LocalVariableInfo):74:74 -> d
+    2:2:com.android.tools.r8.cf.code.CfLabel getStart():107:107 -> d
+    1:1:java.lang.String toString():124:124 -> toString
 com.android.tools.r8.graph.CfCode$StackMapStatus -> com.android.tools.r8.graph.g$b:
     com.android.tools.r8.graph.CfCode$StackMapStatus VALID -> c
     com.android.tools.r8.graph.CfCode$StackMapStatus INVALID_OR_NOT_PRESENT -> b
     com.android.tools.r8.graph.CfCode$StackMapStatus NOT_VERIFIED -> a
-    1:3:void <clinit>():68:70 -> <clinit>
-    1:1:void <init>(java.lang.String,int):67:67 -> <init>
+    1:3:void <clinit>():69:71 -> <clinit>
+    1:1:void <init>(java.lang.String,int):68:68 -> <init>
 com.android.tools.r8.graph.CfCodeDiagnostics -> com.android.tools.r8.internal.o3:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.MethodPosition methodPosition -> b
@@ -16590,7 +16607,7 @@
     5:5:java.util.Comparator instructionComparator():66:66 -> a
     6:6:int lambda$tryCatchRangesComparator$1(com.android.tools.r8.cf.code.CfTryCatch,com.android.tools.r8.cf.code.CfTryCatch):70:70 -> a
     7:7:int lambda$localVariablesComparator$2(com.android.tools.r8.graph.CfCode$LocalVariableInfo,com.android.tools.r8.graph.CfCode$LocalVariableInfo):74:74 -> a
-    1:2:int com.android.tools.r8.cf.code.CfInstruction.compareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):64:65 -> b
+    1:2:int com.android.tools.r8.cf.code.CfInstruction.compareTo(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.CfCompareHelper):66:67 -> b
     1:2:int lambda$instructionComparator$0(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.cf.code.CfInstruction):66 -> b
     3:3:java.util.Comparator localVariablesComparator():74:74 -> b
     1:1:java.util.Comparator tryCatchRangesComparator():70:70 -> c
@@ -16633,7 +16650,7 @@
     2:2:void <init>(int):54:54 -> f
     2:2:com.android.tools.r8.graph.ClassAccessFlags fromDexAccessFlags(int):68 -> f
     1:3:com.android.tools.r8.graph.ClassAccessFlags fromSharedAccessFlags(int):62:64 -> g
-com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.h5:
+com.android.tools.r8.graph.ClassHierarchyTraversal -> com.android.tools.r8.internal.j5:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set visited -> d
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope scope -> c
@@ -16646,7 +16663,7 @@
     void addDependentsToWorklist(com.android.tools.r8.graph.DexClass) -> a
     1:22:void visit(java.lang.Iterable,java.util.function.Consumer):65:86 -> a
     23:36:void visit(java.lang.Iterable,java.util.function.Consumer):69:82 -> a
-com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.internal.g5:
+com.android.tools.r8.graph.ClassHierarchyTraversal$Scope -> com.android.tools.r8.internal.i5:
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ALL_CLASSES -> a
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_CLASSES -> b
     com.android.tools.r8.graph.ClassHierarchyTraversal$Scope ONLY_LIBRARY_AND_CLASSPATH_CLASSES -> c
@@ -16706,7 +16723,7 @@
     boolean isDexCode() -> w
     boolean isEmptyVoidMethod() -> x
     boolean verifyNoInputReaders() -> y
-com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.D7:
+com.android.tools.r8.graph.DebugLocalInfo -> com.android.tools.r8.internal.I7:
     com.android.tools.r8.graph.DexString name -> a
     com.android.tools.r8.graph.DexString signature -> c
     com.android.tools.r8.graph.DexType type -> b
@@ -16724,7 +16741,7 @@
     1:5:boolean equals(java.lang.Object):94:98 -> equals
     1:3:int hashCode():103:105 -> hashCode
     1:1:java.lang.String toString():112:112 -> toString
-com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.D7$a:
+com.android.tools.r8.graph.DebugLocalInfo$PrintLevel -> com.android.tools.r8.internal.I7$a:
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel[] $VALUES -> d
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NAME -> b
     com.android.tools.r8.graph.DebugLocalInfo$PrintLevel NONE -> a
@@ -16732,7 +16749,7 @@
     1:3:void <clinit>():17:19 -> <clinit>
     4:4:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.M7:
+com.android.tools.r8.graph.DefaultInitClassLens -> com.android.tools.r8.internal.R7:
     com.android.tools.r8.graph.DefaultInitClassLens INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -16927,7 +16944,7 @@
     1:2:void <init>(java.util.List):80:81 -> <init>
     1:1:java.util.List getClasses():94:94 -> a
     1:3:boolean reorderClasses():86:88 -> b
-com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.D8:
+com.android.tools.r8.graph.DexByteCodeWriter -> com.android.tools.r8.internal.I8:
     com.android.tools.r8.graph.DexApplication application -> a
     com.android.tools.r8.utils.InternalOptions options -> b
     1:3:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):25:27 -> <init>
@@ -16959,7 +16976,7 @@
     void writeMethodsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> c
     void writeFieldsFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> d
     void writeFieldsHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream) -> e
-com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.D8$a:
+com.android.tools.r8.graph.DexByteCodeWriter$OutputStreamProvider -> com.android.tools.r8.internal.I8$a:
     java.io.PrintStream get(com.android.tools.r8.graph.DexClass) -> a
 com.android.tools.r8.graph.DexCallSite -> com.android.tools.r8.graph.r:
     com.android.tools.r8.graph.DexString methodName -> e
@@ -17057,154 +17074,163 @@
     com.android.tools.r8.graph.DexType superType -> g
     boolean $assertionsDisabled -> c
     com.android.tools.r8.graph.DexType type -> e
-    1:1:void <clinit>():32:32 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):86:86 -> <init>
-    2:73:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):45:116 -> <init>
-    74:74:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):106:106 -> <init>
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):88:88 -> <init>
+    2:73:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):47:118 -> <init>
+    74:74:void <init>(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.ClassAccessFlags,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedField[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.graph.NestHostClassAttribute,java.util.List,com.android.tools.r8.graph.EnclosingMethodAttribute,java.util.List,com.android.tools.r8.graph.GenericSignature$ClassSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.origin.Origin,boolean):108:108 -> <init>
     boolean isStaticMember() -> B
-    1:3:java.lang.Iterable allImmediateSupertypes():710:712 -> C
-    4:7:java.lang.Iterable allImmediateSupertypes():711:714 -> C
-    1:1:java.util.List allMethodsSorted():217:217 -> D
+    1:3:java.lang.Iterable allImmediateSupertypes():738:740 -> C
+    4:7:java.lang.Iterable allImmediateSupertypes():739:742 -> C
+    1:1:java.util.List allMethodsSorted():227:227 -> D
     com.android.tools.r8.graph.DexClasspathClass asClasspathClass() -> E
     com.android.tools.r8.graph.DexLibraryClass asLibraryClass() -> F
-    1:1:void clearClassSignature():776:776 -> G
-    1:1:void clearEnclosingMethodAttribute():762:762 -> H
-    1:1:void clearInnerClasses():772:772 -> I
-    1:1:void clearNestHost():837:837 -> J
-    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():741:742 -> K
-    1:1:java.lang.Iterable directMethods():166:166 -> L
-    1:1:java.lang.Iterable fields():135:135 -> M
-    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():123:123 -> N
-    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():578:579 -> O
-    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():805:805 -> P
-    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():754:754 -> Q
-    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():784:785 -> R
-    1:1:java.util.List getInnerClasses():746:746 -> S
-    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():127:127 -> T
-    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():149:149 -> U
-    1:5:com.android.tools.r8.graph.DexType getNestHost():854:858 -> V
-    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():869:869 -> W
-    1:1:java.util.List getNestMembersClassAttributes():873:873 -> X
-    1:1:com.android.tools.r8.graph.DexType getType():588:588 -> Y
-    1:1:boolean hasClassInitializer():596:596 -> Z
-    java.util.Iterator lambda$allImmediateSupertypes$0(java.util.Iterator) -> a
-    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):162:162 -> a
-    2:2:java.lang.Iterable directMethods(java.util.function.Predicate):170:170 -> a
-    3:3:void addDirectMethods(java.util.Collection):174:174 -> a
-    4:4:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):182:182 -> a
-    5:5:void virtualizeMethods(java.util.Set):221:221 -> a
-    6:10:void forEachField(java.util.function.Consumer):240:244 -> a
-    11:16:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):324:329 -> a
-    17:19:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):354:356 -> a
-    20:22:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):360:362 -> a
-    23:24:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):376:377 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):398:398 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):416 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):393:393 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):417 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):422:422 -> a
-    28:28:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):445:445 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):445 -> a
-    30:31:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):492:493 -> a
-    32:48:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexEncodedMember):0:16 -> a
-    32:48:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):493 -> a
-    49:51:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):604:606 -> a
-    52:55:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):664:667 -> a
-    56:56:boolean isLibraryClass():0:0 -> a
-    56:56:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):670 -> a
-    57:60:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):671:674 -> a
-    61:67:boolean hasClassInitializerThatCannotBePostponed():690:696 -> a
-    61:67:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):678 -> a
-    68:71:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):681:684 -> a
-    72:72:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):737:737 -> a
-    73:73:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
-    73:73:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):737 -> a
-    74:74:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):758:758 -> a
-    75:83:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):793:801 -> a
-    84:84:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):809:809 -> a
-    85:86:void setNestHost(com.android.tools.r8.graph.DexType):841:842 -> a
-    87:87:void lambda$forEachNestMember$2(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):865:865 -> a
-    88:88:boolean isValid(com.android.tools.r8.utils.InternalOptions):905:905 -> a
-    89:92:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):203:206 -> a
-    89:92:boolean isValid(com.android.tools.r8.utils.InternalOptions):905 -> a
-    93:96:boolean isValid(com.android.tools.r8.utils.InternalOptions):906:909 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():614:614 -> a0
-    1:1:boolean hasDefaultInitializer():600 -> a0
+    1:1:void clearClassSignature():804:804 -> G
+    1:1:void clearEnclosingMethodAttribute():790:790 -> H
+    1:1:void clearInnerClasses():800:800 -> I
+    1:1:void clearNestHost():865:865 -> J
+    1:2:boolean defaultValuesForStaticFieldsMayTriggerAllocation():769:770 -> K
+    1:1:java.lang.Iterable directMethods():168:168 -> L
+    1:1:java.lang.Iterable fields():137:137 -> M
+    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():125:125 -> N
+    1:2:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():596:597 -> O
+    1:1:com.android.tools.r8.graph.GenericSignature$ClassSignature getClassSignature():833:833 -> P
+    1:1:com.android.tools.r8.graph.EnclosingMethodAttribute getEnclosingMethodAttribute():782:782 -> Q
+    1:2:com.android.tools.r8.graph.InnerClassAttribute getInnerClassAttributeForThisClass():812:813 -> R
+    1:1:java.util.List getInnerClasses():774:774 -> S
+    1:1:com.android.tools.r8.graph.DexTypeList getInterfaces():129:129 -> T
+    1:1:com.android.tools.r8.graph.MethodCollection getMethodCollection():151:151 -> U
+    1:5:com.android.tools.r8.graph.DexType getNestHost():882:886 -> V
+    1:1:com.android.tools.r8.graph.NestHostClassAttribute getNestHostClassAttribute():897:897 -> W
+    1:1:java.util.List getNestMembersClassAttributes():901:901 -> X
+    1:1:com.android.tools.r8.graph.DexType getType():606:606 -> Y
+    1:1:boolean hasClassInitializer():614:614 -> Z
+    java.util.Iterator lambda$allImmediateSupertypes$1(java.util.Iterator) -> a
+    1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):164:164 -> a
+    2:2:java.lang.Iterable directMethods(java.util.function.Predicate):172:172 -> a
+    3:3:void addDirectMethods(java.util.Collection):176:176 -> a
+    4:4:void setDirectMethods(java.util.List):184:184 -> a
+    5:5:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):188:188 -> a
+    5:5:void setDirectMethods(java.util.List):184 -> a
+    6:6:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):188:188 -> a
+    7:7:void virtualizeMethods(java.util.Set):231:231 -> a
+    8:12:void forEachField(java.util.function.Consumer):250:254 -> a
+    13:18:void appendInstanceField(com.android.tools.r8.graph.DexEncodedField):338:343 -> a
+    19:21:void setInstanceField(int,com.android.tools.r8.graph.DexEncodedField):368:370 -> a
+    22:24:void setInstanceFields(com.android.tools.r8.graph.DexEncodedField[]):374:376 -> a
+    25:26:boolean verifyCorrectnessOfFieldHolders(java.lang.Iterable):390:391 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):412:412 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):430 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):407:407 -> a
+    28:28:com.android.tools.r8.graph.DexEncodedField lookupField(com.android.tools.r8.graph.DexField):431 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(com.android.tools.r8.graph.DexMethod):436:436 -> a
+    30:30:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):459:459 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMember lookupMember(com.android.tools.r8.graph.DexMember):459 -> a
+    32:33:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):506:507 -> a
+    34:50:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexEncodedMember):0:16 -> a
+    34:50:com.android.tools.r8.graph.DexEncodedMember lookupTarget(com.android.tools.r8.graph.DexEncodedMember[],com.android.tools.r8.graph.DexMember):507 -> a
+    51:53:com.android.tools.r8.graph.DexEncodedMethod getInitializer(com.android.tools.r8.graph.DexType[]):622:624 -> a
+    54:60:boolean classInitializationMayHaveSideEffectsInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition):682:682 -> a
+    61:61:boolean lambda$classInitializationMayHaveSideEffectsInContext$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexType):686:686 -> a
+    62:65:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):692:695 -> a
+    66:66:boolean isLibraryClass():0:0 -> a
+    66:66:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):698 -> a
+    67:70:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):699:702 -> a
+    71:77:boolean hasClassInitializerThatCannotBePostponed():718:724 -> a
+    71:77:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):706 -> a
+    78:81:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):709:712 -> a
+    82:82:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):765:765 -> a
+    83:83:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):446:446 -> a
+    83:83:boolean definesFinalizer(com.android.tools.r8.graph.DexItemFactory):765 -> a
+    84:84:void setEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):786:786 -> a
+    85:93:void replaceInnerClassAttributeForThisClass(com.android.tools.r8.graph.InnerClassAttribute):821:829 -> a
+    94:94:void setClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):837:837 -> a
+    95:96:void setNestHost(com.android.tools.r8.graph.DexType):869:870 -> a
+    97:97:void lambda$forEachNestMember$3(java.util.function.Consumer,com.android.tools.r8.graph.NestMemberClassAttribute):893:893 -> a
+    98:98:boolean isValid(com.android.tools.r8.utils.InternalOptions):933:933 -> a
+    99:102:boolean verifyNoAbstractMethodsOnNonAbstractClasses(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):213:216 -> a
+    99:102:boolean isValid(com.android.tools.r8.utils.InternalOptions):933 -> a
+    103:106:boolean isValid(com.android.tools.r8.utils.InternalOptions):934:937 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInitializer():632:632 -> a0
+    1:1:boolean hasDefaultInitializer():618 -> a0
     void addDependencies(com.android.tools.r8.dex.MixedSectionCollection) -> b
-    1:3:java.lang.Iterable fields(java.util.function.Predicate):139:141 -> b
+    1:3:java.lang.Iterable fields(java.util.function.Predicate):141:143 -> b
     4:4:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    4:4:java.lang.Iterable fields(java.util.function.Predicate):139 -> b
-    5:5:void addVirtualMethods(java.util.Collection):194:194 -> b
-    6:6:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):198:198 -> b
-    7:7:void forEachMethod(java.util.function.Consumer):213:213 -> b
-    8:8:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> b
-    8:8:void forEachMethod(java.util.function.Consumer):213 -> b
-    9:14:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):266:271 -> b
-    15:17:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):295:297 -> b
-    18:20:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):301:303 -> b
-    21:21:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):398:398 -> b
-    22:22:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> b
-    23:23:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):659:659 -> b
-    24:24:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):658:658 -> b
-    25:31:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):724:730 -> b
-    1:1:boolean hasInstanceFields():880:880 -> b0
-    1:10:void appendStaticFields(java.util.Collection):275:284 -> c
-    11:11:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):393:393 -> c
-    12:12:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):427:427 -> c
-    13:13:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> c
-    14:14:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):513:513 -> c
-    15:15:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$1(com.android.tools.r8.graph.DexEncodedField):742:742 -> c
-    16:17:void forEachNestMember(java.util.function.Consumer):864:865 -> c
-    1:2:boolean hasStaticSynchronizedMethods():914:915 -> c0
-    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> c0
-    3:3:boolean hasStaticSynchronizedMethods():915 -> c0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):178:178 -> d
-    2:6:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):366:370 -> d
-    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):437:437 -> d
-    8:14:boolean isResolvable(com.android.tools.r8.graph.AppView):630:636 -> d
+    4:4:java.lang.Iterable fields(java.util.function.Predicate):141 -> b
+    5:5:void addVirtualMethods(java.util.Collection):200:200 -> b
+    6:6:void setVirtualMethods(java.util.List):204:204 -> b
+    7:7:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):208:208 -> b
+    7:7:void setVirtualMethods(java.util.List):204 -> b
+    8:8:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):208:208 -> b
+    9:9:void forEachMethod(java.util.function.Consumer):223:223 -> b
+    10:10:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> b
+    10:10:void forEachMethod(java.util.function.Consumer):223 -> b
+    11:16:void appendStaticField(com.android.tools.r8.graph.DexEncodedField):280:285 -> b
+    17:19:void setStaticField(int,com.android.tools.r8.graph.DexEncodedField):309:311 -> b
+    20:22:void setStaticFields(com.android.tools.r8.graph.DexEncodedField[]):315:317 -> b
+    23:23:com.android.tools.r8.graph.DexEncodedField lookupInstanceField(com.android.tools.r8.graph.DexField):412:412 -> b
+    24:24:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> b
+    25:25:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):677:677 -> b
+    26:26:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView):676:676 -> b
+    27:33:boolean initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):752:758 -> b
+    1:1:boolean hasInstanceFields():908:908 -> b0
+    1:10:void appendStaticFields(java.util.Collection):289:298 -> c
+    11:11:com.android.tools.r8.graph.DexEncodedField lookupStaticField(com.android.tools.r8.graph.DexField):407:407 -> c
+    12:12:com.android.tools.r8.graph.DexEncodedMethod lookupDirectMethod(java.util.function.Predicate):441:441 -> c
+    13:13:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):446:446 -> c
+    14:14:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):531:531 -> c
+    15:15:boolean lambda$defaultValuesForStaticFieldsMayTriggerAllocation$2(com.android.tools.r8.graph.DexEncodedField):770:770 -> c
+    16:17:void forEachNestMember(java.util.function.Consumer):892:893 -> c
+    1:2:boolean hasStaticSynchronizedMethods():942:943 -> c0
+    3:3:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> c0
+    3:3:boolean hasStaticSynchronizedMethods():943 -> c0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):180:180 -> d
+    2:6:boolean verifyCorrectnessOfFieldHolder(com.android.tools.r8.graph.DexEncodedField):380:384 -> d
+    7:7:com.android.tools.r8.graph.DexEncodedMethod lookupVirtualMethod(java.util.function.Predicate):451:451 -> d
+    8:14:boolean isResolvable(com.android.tools.r8.graph.AppView):648:654 -> d
     15:15:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):0:0 -> d
-    15:15:boolean isResolvable(com.android.tools.r8.graph.AppView):637 -> d
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
-    16:16:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):352 -> d
-    16:16:boolean isResolvable(com.android.tools.r8.graph.AppView):637 -> d
-    17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):353:353 -> d
-    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):637 -> d
-    18:21:boolean isResolvable(com.android.tools.r8.graph.AppView):643:646 -> d
-    1:5:java.util.List instanceFields():316:320 -> d0
-    1:1:java.lang.Iterable methods(java.util.function.Predicate):157:157 -> e
-    2:2:boolean isSerializable(com.android.tools.r8.graph.AppView):650:650 -> e
+    15:15:boolean isResolvable(com.android.tools.r8.graph.AppView):655 -> d
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> d
+    16:16:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):357 -> d
+    16:16:boolean isResolvable(com.android.tools.r8.graph.AppView):655 -> d
+    17:17:boolean com.android.tools.r8.graph.DexType.isResolvable(com.android.tools.r8.graph.AppView):358:358 -> d
+    17:17:boolean isResolvable(com.android.tools.r8.graph.AppView):655 -> d
+    18:21:boolean isResolvable(com.android.tools.r8.graph.AppView):661:664 -> d
+    1:5:java.util.List instanceFields():330:334 -> d0
+    1:1:java.lang.Iterable methods(java.util.function.Predicate):159:159 -> e
+    2:2:boolean isSerializable(com.android.tools.r8.graph.AppView):668:668 -> e
     3:3:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):281:281 -> e
-    3:3:boolean isSerializable(com.android.tools.r8.graph.AppView):650 -> e
-    1:1:boolean isAbstract():501:501 -> e0
-    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):766:767 -> f
-    1:1:boolean isAnnotation():505:505 -> f0
-    1:1:void removeInnerClasses(java.util.function.Predicate):780:780 -> g
-    1:4:boolean isAnonymousClass():826:829 -> g0
-    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():123:123 -> getAccessFlags
-    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():32 -> getAccessFlags
-    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):190:190 -> h
+    3:3:boolean isSerializable(com.android.tools.r8.graph.AppView):668 -> e
+    1:1:boolean isAbstract():519:519 -> e0
+    1:2:void removeEnclosingMethodAttribute(java.util.function.Predicate):794:795 -> f
+    1:1:boolean isAnnotation():523:523 -> f0
+    1:1:void removeInnerClasses(java.util.function.Predicate):808:808 -> g
+    1:4:boolean isAnonymousClass():854:857 -> g0
+    1:1:com.android.tools.r8.graph.ClassAccessFlags getAccessFlags():125:125 -> getAccessFlags
+    1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():34 -> getAccessFlags
+    1:1:com.android.tools.r8.origin.Origin getOrigin():602:602 -> getOrigin
+    1:1:java.lang.Iterable virtualMethods(java.util.function.Predicate):196:196 -> h
     boolean isClasspathClass() -> h0
-    1:1:boolean isEnum():521:521 -> i0
-    1:1:boolean isFinal():509:509 -> j0
-    1:1:boolean isInANest():833:833 -> k0
-    1:1:boolean isInterface():517:517 -> l0
+    1:1:boolean isEnum():539:539 -> i0
+    1:1:boolean isFinal():527:527 -> j0
+    1:1:boolean isInANest():861:861 -> k0
+    1:1:boolean isInterface():535:535 -> l0
     boolean isLibraryClass() -> m0
-    1:3:boolean isLocalClass():813:815 -> n0
-    1:3:boolean isMemberClass():819:821 -> o0
-    1:1:boolean isNestHost():846:846 -> p0
+    1:3:boolean isLocalClass():841:843 -> n0
+    1:3:boolean isMemberClass():847:849 -> o0
+    1:1:boolean isNestHost():874:874 -> p0
     com.android.tools.r8.graph.DexClass asDexClass() -> q
-    1:1:boolean isNestMember():850:850 -> q0
+    1:1:boolean isNestMember():878:878 -> q0
     boolean isNotProgramClass() -> r0
-    1:1:java.lang.Iterable members():145:145 -> s0
+    1:1:java.lang.Iterable members():147:147 -> s0
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> s0
-    2:2:java.lang.Iterable members():145 -> s0
-    1:1:java.lang.Iterable methods():153:153 -> t0
-    1:5:java.util.List staticFields():258:262 -> u0
-    1:1:com.android.tools.r8.graph.DexReference getReference():528:528 -> v
-    1:4:boolean verifyNoDuplicateFields():383:386 -> v0
+    2:2:java.lang.Iterable members():147 -> s0
+    1:1:java.lang.Iterable methods():155:155 -> t0
+    1:5:java.util.List staticFields():268:272 -> u0
+    1:1:com.android.tools.r8.graph.DexReference getReference():546:546 -> v
+    1:4:boolean verifyNoDuplicateFields():397:400 -> v0
     boolean isDexClass() -> w
-    1:1:java.lang.Iterable virtualMethods():186:186 -> w0
+    1:1:java.lang.Iterable virtualMethods():192:192 -> w0
 com.android.tools.r8.graph.DexClass$FieldSetter -> com.android.tools.r8.graph.s$a:
     void setField(int,com.android.tools.r8.graph.DexEncodedField) -> a
 com.android.tools.r8.graph.DexClassAndField -> com.android.tools.r8.graph.t:
@@ -17214,7 +17240,7 @@
     1:4:com.android.tools.r8.graph.DexClassAndField create(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):15:18 -> a
     1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():24:24 -> getAccessFlags
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():7 -> getAccessFlags
-    2:2:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():104:104 -> getAccessFlags
+    2:2:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():105:105 -> getAccessFlags
     2:2:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():24 -> getAccessFlags
     2:2:com.android.tools.r8.graph.AccessFlags getAccessFlags():7 -> getAccessFlags
     boolean isProgramField() -> n
@@ -17228,12 +17254,12 @@
     1:1:com.android.tools.r8.graph.DexEncodedMember getDefinition():39:39 -> b
     1:1:com.android.tools.r8.graph.DexType getHolderType():35:35 -> d
     1:1:boolean equals(java.lang.Object):61:61 -> equals
+    1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> getOrigin
     1:1:int hashCode():66:66 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getContextType():27:27 -> k
     1:1:com.android.tools.r8.graph.DexClass getHolder():31:31 -> p
-    1:1:com.android.tools.r8.origin.Origin getOrigin():47:47 -> q
-    1:1:com.android.tools.r8.graph.DexMember getReference():43:43 -> r
-    1:1:java.lang.String toSourceString():51:51 -> s
+    1:1:com.android.tools.r8.graph.DexMember getReference():43:43 -> q
+    1:1:java.lang.String toSourceString():51:51 -> r
     1:1:java.lang.String toString():56:56 -> toString
 com.android.tools.r8.graph.DexClassAndMethod -> com.android.tools.r8.graph.v:
     int $r8$clinit -> e
@@ -17252,10 +17278,10 @@
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():7:7 -> getAccessFlags
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> i
     boolean isMethodTarget() -> m
-    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> t
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():32:32 -> u
-    2:2:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> u
-    2:2:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():32 -> u
+    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> s
+    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():32:32 -> t
+    2:2:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> t
+    2:2:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():32 -> t
 com.android.tools.r8.graph.DexClasspathClass -> com.android.tools.r8.graph.w:
     boolean $assertionsDisabled -> s
     1:1:void <clinit>():16:16 -> <clinit>
@@ -17379,7 +17405,7 @@
     1:1:boolean equals(java.lang.Object):615:615 -> equals
     1:1:int hashCode():610:610 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getType():590:590 -> p
-com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.E8:
+com.android.tools.r8.graph.DexDebugEntry -> com.android.tools.r8.internal.J8:
     com.android.tools.r8.ir.code.Position callerPosition -> j
     com.android.tools.r8.graph.DexString sourceFile -> e
     com.android.tools.r8.graph.DexMethod method -> i
@@ -17672,7 +17698,7 @@
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$compareTo$2(com.android.tools.r8.graph.DexDebugInfo):58:58 -> d
     1:3:int computeHashCode():39:41 -> p
     1:8:java.lang.String toString():80:87 -> toString
-com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.F8:
+com.android.tools.r8.graph.DexDebugInfoForWriting -> com.android.tools.r8.internal.K8:
     1:5:void <init>(com.android.tools.r8.graph.DexDebugInfo):17:17 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.graph.DexDebugEvent):19:19 -> a
     1:1:com.android.tools.r8.graph.DexDebugEvent[] lambda$new$1(int):20:20 -> g
@@ -17738,7 +17764,7 @@
     boolean isDexEncodedField() -> x
     boolean isDexEncodedMember() -> y
     boolean isDexEncodedMethod() -> z
-com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.G8:
+com.android.tools.r8.graph.DexDefinitionSupplier -> com.android.tools.r8.internal.L8:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory() -> a
     1:1:com.android.tools.r8.graph.DexClass contextIndependentDefinitionFor(com.android.tools.r8.graph.DexType):18:18 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
@@ -17799,94 +17825,98 @@
     1:2:void <clinit>():25:26 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean):45:45 -> <init>
     2:19:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue,boolean):35:52 -> <init>
-    1:1:boolean isStatic():171:171 -> A
-    1:1:boolean isStatic():171:171 -> B
-    1:1:boolean isStaticMember():192 -> B
-    1:1:com.android.tools.r8.graph.DexField getReference():134:134 -> C
-    1:1:com.android.tools.r8.graph.DexMember getReference():25 -> C
-    1:1:void clearGenericSignature():334:334 -> E
-    1:2:void clearStaticValue():215:216 -> F
-    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():104:104 -> G
-    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():325:325 -> H
-    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():99:99 -> I
-    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():85:85 -> J
-    2:2:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> J
-    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():85 -> J
-    3:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():86:90 -> J
-    8:8:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> J
-    8:8:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():90 -> J
-    9:10:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():90:91 -> J
-    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():81:81 -> K
-    1:1:com.android.tools.r8.graph.DexField getReference():134:134 -> L
-    1:2:com.android.tools.r8.graph.DexValue getStaticValue():220:221 -> M
-    1:1:boolean hasAnnotation():200:200 -> N
-    1:2:boolean hasExplicitStaticValue():204:205 -> O
-    1:1:boolean isDeprecated():69:69 -> P
-    1:1:boolean isVolatile():196:196 -> Q
-    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> Q
-    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():81 -> Q
-    2:2:boolean isVolatile():196 -> Q
-    1:1:com.android.tools.r8.graph.DexType type():65:65 -> R
+    1:1:boolean isStatic():172:172 -> A
+    1:1:boolean isStatic():172:172 -> B
+    1:1:boolean isStaticMember():193 -> B
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():100:100 -> C
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo():25 -> C
+    1:1:com.android.tools.r8.graph.DexField getReference():135:135 -> D
+    1:1:com.android.tools.r8.graph.DexMember getReference():25 -> D
+    1:1:void clearGenericSignature():335:335 -> F
+    1:2:void clearStaticValue():216:217 -> G
+    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():105:105 -> H
+    1:1:com.android.tools.r8.graph.GenericSignature$FieldTypeSignature getGenericSignature():326:326 -> I
+    1:1:com.android.tools.r8.kotlin.KotlinFieldLevelInfo getKotlinMemberInfo():100:100 -> J
+    1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():85:85 -> K
+    2:2:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> K
+    2:2:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():85 -> K
+    3:7:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():86:90 -> K
+    8:8:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> K
+    8:8:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():90 -> K
+    9:10:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo getMutableOptimizationInfo():90:91 -> K
+    1:1:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():81:81 -> L
+    1:1:com.android.tools.r8.graph.DexField getReference():135:135 -> M
+    1:2:com.android.tools.r8.graph.DexValue getStaticValue():221:222 -> N
+    1:1:boolean hasAnnotation():201:201 -> O
+    1:2:boolean hasExplicitStaticValue():205:206 -> P
+    1:1:boolean isDeprecated():69:69 -> Q
+    1:1:boolean isPrivate():180:180 -> R
+    1:1:boolean isVolatile():197:197 -> S
+    2:2:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> S
+    2:2:boolean com.android.tools.r8.graph.FieldAccessFlags.isVolatile():85 -> S
+    2:2:boolean isVolatile():197 -> S
+    1:1:com.android.tools.r8.graph.DexType type():65:65 -> T
     1:1:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo):95:95 -> a
-    2:3:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):108:109 -> a
-    4:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):114:114 -> a
-    5:6:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):153:154 -> a
-    5:6:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):149 -> a
+    2:3:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinFieldLevelInfo):109:110 -> a
+    4:4:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):115:115 -> a
+    5:6:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):154:155 -> a
+    5:6:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):150 -> a
     5:6:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):25 -> a
     7:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    7:96:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):154 -> a
-    7:96:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):149 -> a
+    7:96:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):155 -> a
+    7:96:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):150 -> a
     7:96:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):25 -> a
-    97:99:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):154:156 -> a
-    97:99:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):149 -> a
+    97:99:com.android.tools.r8.graph.ProgramField asProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):155:157 -> a
+    97:99:com.android.tools.r8.graph.ProgramField asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):150 -> a
     97:99:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):25 -> a
-    100:102:void setStaticValue(com.android.tools.r8.graph.DexValue):209:211 -> a
-    103:103:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):231:231 -> a
-    104:104:boolean isStatic():171:171 -> a
-    104:104:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):234 -> a
-    105:106:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):234:235 -> a
+    100:102:void setStaticValue(com.android.tools.r8.graph.DexValue):210:212 -> a
+    103:103:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):232:232 -> a
+    104:104:boolean isStatic():172:172 -> a
+    104:104:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):235 -> a
+    105:106:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):235:236 -> a
     107:107:com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo getOptimizationInfo():81:81 -> a
-    107:107:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):239 -> a
-    108:118:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):239:249 -> a
-    119:126:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):248:255 -> a
-    127:127:boolean isStatic():171:171 -> a
-    127:127:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):255 -> a
-    128:128:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):256:256 -> a
-    129:129:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    129:129:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):256 -> a
-    130:135:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):257:262 -> a
-    136:141:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):296:301 -> a
+    107:107:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):240 -> a
+    108:118:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):240:250 -> a
+    119:126:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):249:256 -> a
+    127:127:boolean isStatic():172:172 -> a
+    127:127:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):256 -> a
+    128:128:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):257:257 -> a
+    129:129:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    129:129:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):257 -> a
+    130:135:com.android.tools.r8.ir.code.Instruction valueAsConstInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.graph.AppView):258:263 -> a
+    136:141:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):297:302 -> a
     142:142:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
-    142:142:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):301 -> a
-    143:143:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303:303 -> a
+    142:142:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):302 -> a
+    143:143:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):304:304 -> a
     144:144:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
-    144:144:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):303 -> a
-    145:146:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):304:305 -> a
-    147:154:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):310:317 -> a
+    144:144:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):304 -> a
+    145:146:com.android.tools.r8.graph.DexEncodedField toTypeSubstitutedField(com.android.tools.r8.graph.DexField):305:306 -> a
+    147:154:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):311:318 -> a
     155:155:boolean com.android.tools.r8.graph.DexValue.isDexValueNull():0:0 -> a
-    155:155:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):317 -> a
-    156:156:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):318:318 -> a
-    157:158:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):329:330 -> a
+    155:155:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):318 -> a
+    156:156:boolean validateDexValue(com.android.tools.r8.graph.DexItemFactory):319:319 -> a
+    157:158:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$FieldTypeSignature):330:331 -> a
     1:2:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):73:74 -> b
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     3:3:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):74 -> b
     4:4:boolean isProgramField(com.android.tools.r8.graph.DexDefinitionSupplier):75:75 -> b
-    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():104:104 -> getAccessFlags
+    1:1:com.android.tools.r8.graph.FieldAccessFlags getAccessFlags():105:105 -> getAccessFlags
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():25 -> getAccessFlags
-    1:1:java.lang.String toSourceString():129:129 -> m
+    1:1:java.lang.String toSourceString():130:130 -> m
     com.android.tools.r8.graph.DexEncodedField asDexEncodedField() -> r
-    1:1:java.lang.String toString():119:119 -> toString
-    1:1:com.android.tools.r8.graph.DexField getReference():134:134 -> v
+    1:1:java.lang.String toString():120:120 -> toString
+    1:1:com.android.tools.r8.graph.DexField getReference():135:135 -> v
     1:1:com.android.tools.r8.graph.DexReference getReference():25 -> v
-com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.H8:
-    1:1:void <init>(com.android.tools.r8.graph.DexAnnotationSet):10:10 -> <init>
-    com.android.tools.r8.graph.DexMember getReference() -> C
-    1:1:com.android.tools.r8.graph.DexType holder():14:14 -> D
+com.android.tools.r8.graph.DexEncodedMember -> com.android.tools.r8.internal.M8:
+    1:1:void <init>(com.android.tools.r8.graph.DexAnnotationSet):12:12 -> <init>
+    com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo() -> C
+    com.android.tools.r8.graph.DexMember getReference() -> D
+    1:1:com.android.tools.r8.graph.DexType holder():16:16 -> E
     com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-    1:2:boolean equals(java.lang.Object):37:38 -> equals
-    1:1:int hashCode():43:43 -> hashCode
+    1:2:boolean equals(java.lang.Object):41:42 -> equals
+    1:1:int hashCode():47:47 -> hashCode
     com.android.tools.r8.graph.DexEncodedMember asDexEncodedMember() -> s
-    1:1:com.android.tools.r8.graph.DexReference getReference():6:6 -> v
+    1:1:com.android.tools.r8.graph.DexReference getReference():8:8 -> v
     boolean isDexEncodedMember() -> y
 com.android.tools.r8.graph.DexEncodedMethod -> com.android.tools.r8.graph.I:
     com.android.tools.r8.cf.CfVersion classFileVersion -> o
@@ -17914,299 +17944,302 @@
     2:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> <init>
     3:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,boolean):303:303 -> <init>
     4:167:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion,boolean):151:314 -> <init>
-    1:2:boolean isStatic():580:581 -> A
-    1:1:com.android.tools.r8.graph.DexTypeList parameters():385:385 -> A0
-    1:2:boolean isStaticMember():586:587 -> B
-    1:1:com.android.tools.r8.graph.DexProto proto():389:389 -> B0
-    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> C
-    1:2:com.android.tools.r8.graph.DexMember getReference():92 -> C
-    1:2:java.lang.String qualifiedName():826:827 -> C0
-    1:2:void removeCode():804:805 -> D0
-    1:2:void abandonCallSiteOptimizationInfo():1429:1430 -> E
-    1:1:com.android.tools.r8.graph.DexType returnType():393:393 -> E0
-    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():956:963 -> F
-    1:1:void setObsolete():196:196 -> F0
-    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():967:968 -> G
-    1:1:boolean shouldNotHaveCode():791:791 -> G0
-    1:1:void checkIfObsolete():184:184 -> H
-    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():882:888 -> H0
-    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():158:158 -> H0
-    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():888 -> H0
-    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():889:889 -> H0
-    1:1:void clearGenericSignature():1461:1461 -> I
-    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1339:1346 -> I0
-    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1445:1447 -> I0
-    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1347 -> I0
-    12:12:void setObsolete():196:196 -> I0
-    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1348 -> I0
-    1:2:java.lang.String codeToString():1381:1382 -> J
-    1:1:void unsetObsolete():232:232 -> J0
-    1:2:java.lang.String descriptor():831:832 -> K
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():201:201 -> L
-    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1434:1435 -> M
-    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():809:811 -> N
-    1:2:com.android.tools.r8.graph.Code getCode():799:800 -> O
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():205:205 -> P
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():209:209 -> Q
-    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1452:1452 -> R
-    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():599:599 -> S
-    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1416:1420 -> T
-    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> U
-    1:2:com.android.tools.r8.graph.DexString getName():371 -> U
-    3:3:com.android.tools.r8.graph.DexString getName():371:371 -> U
-    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1411:1412 -> V
-    1:1:java.util.Map getParameterInfo():766:766 -> W
-    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> X
-    1:2:com.android.tools.r8.graph.DexProto getProto():375 -> X
-    3:3:com.android.tools.r8.graph.DexProto getProto():375:375 -> X
-    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> Y
-    1:2:boolean hasAnnotation():1402:1403 -> Z
+    1:2:boolean isStatic():584:585 -> A
+    1:2:boolean isVirtualMethod():531:532 -> A0
+    1:2:boolean isStaticMember():590:591 -> B
+    1:2:void markNotProcessed():742:743 -> B0
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():612:612 -> C
+    1:1:com.android.tools.r8.kotlin.KotlinMemberLevelInfo getKotlinMemberInfo():92 -> C
+    1:1:com.android.tools.r8.graph.DexTypeList parameters():389:389 -> C0
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> D
+    1:2:com.android.tools.r8.graph.DexMember getReference():92 -> D
+    1:1:com.android.tools.r8.graph.DexProto proto():393:393 -> D0
+    1:2:java.lang.String qualifiedName():839:840 -> E0
+    1:2:void abandonCallSiteOptimizationInfo():1442:1443 -> F
+    1:2:void removeCode():817:818 -> F0
+    1:1:boolean belongsToDirectPool():603:603 -> G
+    1:1:com.android.tools.r8.graph.DexType returnType():397:397 -> G0
+    1:8:com.android.tools.r8.graph.CfCode buildEmptyThrowingCfCode():969:976 -> H
+    1:1:void setObsolete():196:196 -> H0
+    1:2:com.android.tools.r8.graph.DexCode buildEmptyThrowingDexCode():980:981 -> I
+    1:1:boolean shouldNotHaveCode():804:804 -> I0
+    1:1:void checkIfObsolete():184:184 -> J
+    1:7:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():895:901 -> J0
+    8:8:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():167:167 -> J0
+    8:8:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():901 -> J0
+    9:9:com.android.tools.r8.graph.DexEncodedMethod toAbstractMethod():902:902 -> J0
+    1:1:void clearGenericSignature():1474:1474 -> K
+    1:8:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1352:1359 -> K0
+    9:11:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1458:1460 -> K0
+    9:11:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1360 -> K0
+    12:12:void setObsolete():196:196 -> K0
+    12:12:com.android.tools.r8.graph.DexEncodedMethod toStaticMethodWithoutThis():1361 -> K0
+    1:2:java.lang.String codeToString():1394:1395 -> L
+    1:1:void unsetObsolete():232:232 -> L0
+    1:2:java.lang.String descriptor():844:845 -> M
+    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():201:201 -> N
+    1:2:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo getCallSiteOptimizationInfo():1447:1448 -> O
+    1:3:com.android.tools.r8.cf.CfVersion getClassFileVersion():822:824 -> P
+    1:2:com.android.tools.r8.graph.Code getCode():812:813 -> Q
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$CompilationState getCompilationState():205:205 -> R
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getDefaultInterfaceMethodImplementation():209:209 -> S
+    1:1:com.android.tools.r8.graph.GenericSignature$MethodTypeSignature getGenericSignature():1465:1465 -> T
+    1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo getKotlinMemberInfo():612:612 -> U
+    1:5:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo getMutableOptimizationInfo():1429:1433 -> V
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> W
+    1:2:com.android.tools.r8.graph.DexString getName():371 -> W
+    3:3:com.android.tools.r8.graph.DexString getName():371:371 -> W
+    1:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1424:1425 -> X
+    1:1:java.util.Map getParameterInfo():779:779 -> Y
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> Z
+    1:2:com.android.tools.r8.graph.DexProto getProto():375 -> Z
+    3:3:com.android.tools.r8.graph.DexProto getProto():375:375 -> Z
     1:1:boolean access$300(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> a
     2:2:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$502(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo):92:92 -> a
     3:3:com.android.tools.r8.graph.DexEncodedMethod$CompilationState access$802(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$CompilationState):92:92 -> a
     4:4:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):324:324 -> a
-    5:7:void com.android.tools.r8.graph.DexProto.hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):123:125 -> a
+    5:7:void com.android.tools.r8.graph.DexProto.hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):127:129 -> a
     5:7:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):324 -> a
     8:21:void hashSyntheticContent(com.android.tools.r8.com.google.common.hash.Hasher):325:338 -> a
-    22:25:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):406:409 -> a
-    26:32:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):408:414 -> a
-    33:38:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):413:418 -> a
-    39:39:com.android.tools.r8.graph.ProgramMethod asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):431:431 -> a
-    39:39:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):92 -> a
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    40:40:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):972 -> a
-    41:56:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):978:993 -> a
-    41:56:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):973 -> a
-    57:64:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):997:1004 -> a
-    57:64:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):974 -> a
-    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):435:436 -> a
-    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):454 -> a
+    22:25:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):410:413 -> a
+    26:32:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):412:418 -> a
+    33:38:void setLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):417:422 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    39:39:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):985 -> a
+    40:55:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):991:1006 -> a
+    40:55:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):986 -> a
+    56:63:com.android.tools.r8.graph.DexCode buildInstanceOfDexCode(com.android.tools.r8.graph.DexType,boolean):1010:1017 -> a
+    56:63:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):987 -> a
+    64:64:com.android.tools.r8.graph.ProgramMethod asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):435:435 -> a
+    64:64:com.android.tools.r8.graph.ProgramMember asProgramMember(com.android.tools.r8.graph.DexDefinitionSupplier):92 -> a
+    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):439:440 -> a
+    65:66:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):458 -> a
     67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> a
-    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):436 -> a
-    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):454 -> a
-    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):438:438 -> a
-    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):454 -> a
-    69:70:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):612:613 -> a
-    71:73:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):633:635 -> a
-    74:74:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):634:634 -> a
-    75:130:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):643:698 -> a
-    131:131:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):694:694 -> a
-    132:132:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):690:690 -> a
-    133:136:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):683:686 -> a
-    137:140:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):676:679 -> a
-    141:144:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):669:672 -> a
-    145:148:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):662:665 -> a
-    149:168:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):703:722 -> a
-    169:169:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):719:719 -> a
-    170:170:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):716:716 -> a
-    171:171:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):713:713 -> a
-    172:172:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):710:710 -> a
-    173:191:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):707:725 -> a
-    192:195:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):734:737 -> a
-    196:196:boolean hasParameterInfo():762:762 -> a
-    196:196:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):737 -> a
-    197:198:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):737:738 -> a
-    199:200:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):757:758 -> a
-    199:200:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):738 -> a
-    201:201:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):740:740 -> a
-    202:204:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):744:746 -> a
-    205:208:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):750:753 -> a
-    209:210:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1411:1412 -> a
-    209:210:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):753 -> a
-    211:211:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):753:753 -> a
-    212:212:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):777:777 -> a
-    213:218:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):782:787 -> a
-    219:221:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):820:822 -> a
-    222:230:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):836:844 -> a
-    231:236:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):856:861 -> a
+    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):440 -> a
+    67:67:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):458 -> a
+    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethod(com.android.tools.r8.graph.DexDefinitionSupplier):442:442 -> a
+    68:68:com.android.tools.r8.graph.DexClassAndMethod asDexClassAndMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):458 -> a
+    69:70:void setKotlinMemberInfo(com.android.tools.r8.kotlin.KotlinMethodLevelInfo):625:626 -> a
+    71:73:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):646:648 -> a
+    74:74:boolean isInliningCandidate(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):647:647 -> a
+    75:130:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):656:711 -> a
+    131:131:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):707:707 -> a
+    132:132:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):703:703 -> a
+    133:136:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):696:699 -> a
+    137:140:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):689:692 -> a
+    141:144:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):682:685 -> a
+    145:148:boolean isInliningCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):675:678 -> a
+    149:168:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):716:735 -> a
+    169:169:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):732:732 -> a
+    170:170:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):729:729 -> a
+    171:171:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):726:726 -> a
+    172:172:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):723:723 -> a
+    173:191:boolean markProcessed(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget):720:738 -> a
+    192:195:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):747:750 -> a
+    196:196:boolean hasParameterInfo():775:775 -> a
+    196:196:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):750 -> a
+    197:198:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):750:751 -> a
+    199:200:void setParameterInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):770:771 -> a
+    199:200:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):751 -> a
+    201:201:void setCode(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.AppView):753:753 -> a
+    202:204:void setCode(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.graph.AppView):757:759 -> a
+    205:208:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):763:766 -> a
+    209:210:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo getOptimizationInfo():1424:1425 -> a
+    209:210:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):766 -> a
+    211:211:boolean keepLocals(com.android.tools.r8.utils.InternalOptions):766:766 -> a
+    212:212:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):790:790 -> a
+    213:218:void collectMixedSectionItemsWithCodeMapping(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.dex.MethodToCodeObjectMapping):795:800 -> a
+    219:221:void upgradeClassFileVersion(com.android.tools.r8.cf.CfVersion):833:835 -> a
+    222:230:java.lang.String descriptor(com.android.tools.r8.naming.NamingLens):849:857 -> a
+    231:236:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):869:874 -> a
     237:237:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
-    237:237:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):861 -> a
-    238:239:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):861:862 -> a
+    237:237:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):874 -> a
+    238:239:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):874:875 -> a
     240:240:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():0:0 -> a
-    240:240:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):862 -> a
-    241:241:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():108:108 -> a
-    241:241:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():104 -> a
-    241:241:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):862 -> a
-    242:248:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):862:868 -> a
+    240:240:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):875 -> a
+    241:241:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():112:112 -> a
+    241:241:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():108 -> a
+    241:241:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):875 -> a
+    242:248:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):875:881 -> a
     249:304:java.lang.String com.android.tools.r8.graph.DexCode.toSmaliString(com.android.tools.r8.naming.ClassNameMapper):339:394 -> a
-    249:304:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):869 -> a
-    305:308:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):869:872 -> a
-    309:318:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):899:908 -> a
-    319:323:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1016:1020 -> a
-    324:329:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1019:1024 -> a
-    330:331:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1119:1120 -> a
-    332:346:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1124:1138 -> a
-    347:351:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1142:1146 -> a
+    249:304:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):882 -> a
+    305:308:java.lang.String toSmaliString(com.android.tools.r8.naming.ClassNameMapper):882:885 -> a
+    309:318:com.android.tools.r8.graph.DexCode generateCodeFromTemplate(int,int,com.android.tools.r8.code.Instruction[]):912:921 -> a
+    319:323:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1029:1033 -> a
+    324:329:void setDebugInfoWithFakeThisParameter(com.android.tools.r8.graph.Code,int,com.android.tools.r8.graph.AppView):1032:1037 -> a
+    330:331:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod):1132:1133 -> a
+    332:346:com.android.tools.r8.graph.DexEncodedMethod toTypeSubstitutedMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):1137:1151 -> a
+    347:351:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1155:1159 -> a
     352:376:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    352:376:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1148 -> a
-    377:390:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1149:1162 -> a
-    391:391:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():178:178 -> a
-    391:391:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1162 -> a
-    392:392:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1163:1163 -> a
-    393:398:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1168:1173 -> a
-    399:428:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1170:1199 -> a
+    352:376:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1161 -> a
+    377:390:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1162:1175 -> a
+    391:391:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():187:187 -> a
+    391:391:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1175 -> a
+    392:392:com.android.tools.r8.graph.ProgramMethod toInitializerForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1176:1176 -> a
+    393:398:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1181:1186 -> a
+    399:428:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1183:1212 -> a
     429:429:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
     429:429:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
-    429:429:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1199 -> a
-    430:430:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1199:1199 -> a
-    431:431:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):1178:1178 -> a
-    432:435:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1181:1184 -> a
+    429:429:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1212 -> a
+    430:430:com.android.tools.r8.graph.ProgramMethod createFieldAccessorBridge(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1212:1212 -> a
+    431:431:com.android.tools.r8.ir.conversion.SourceCode lambda$createFieldAccessorBridge$5(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.ir.code.Position):1191:1191 -> a
+    432:435:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1194:1197 -> a
     436:436:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstance():496:496 -> a
     436:436:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():512 -> a
-    436:436:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1185 -> a
+    436:436:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1198 -> a
     437:437:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isInstancePut():512:512 -> a
-    437:437:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1185 -> a
-    438:440:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1186:1188 -> a
+    437:437:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1198 -> a
+    438:440:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1199:1201 -> a
     441:441:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():504:504 -> a
-    441:441:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1188 -> a
-    442:443:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1188:1189 -> a
-    444:446:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1205:1207 -> a
-    447:458:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1218:1229 -> a
+    441:441:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1201 -> a
+    442:443:void lambda$createFieldAccessorBridge$6(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess,com.android.tools.r8.graph.UseRegistry):1201:1202 -> a
+    444:446:com.android.tools.r8.graph.DexEncodedMethod toRenamedHolderMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):1218:1220 -> a
+    447:458:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1231:1242 -> a
     459:459:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
-    459:459:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1229 -> a
-    460:465:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1266:1271 -> a
+    459:459:com.android.tools.r8.graph.DexEncodedMethod toEmulateDispatchLibraryMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,java.util.List,com.android.tools.r8.graph.AppView):1242 -> a
+    460:465:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1279:1284 -> a
     466:466:void com.android.tools.r8.graph.AccessFlags.demoteFromFinal():219:219 -> a
-    466:466:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1271 -> a
-    467:474:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1273:1280 -> a
-    475:475:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():158:158 -> a
-    475:475:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1280 -> a
-    476:476:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1283:1283 -> a
-    477:477:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    477:477:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1283 -> a
+    466:466:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1284 -> a
+    467:474:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1286:1293 -> a
+    475:475:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():167:167 -> a
+    475:475:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1293 -> a
+    476:476:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1296:1296 -> a
+    477:477:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    477:477:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1296 -> a
     478:502:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    478:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1285 -> a
-    503:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1287:1307 -> a
-    524:527:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.UseRegistry):1296:1299 -> a
-    528:535:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1312:1319 -> a
-    536:536:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():162:162 -> a
-    536:536:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1320 -> a
+    478:502:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1298 -> a
+    503:523:com.android.tools.r8.graph.DexEncodedMethod toForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):1300:1320 -> a
+    524:527:void lambda$toForwardingMethod$8(com.android.tools.r8.graph.UseRegistry):1309:1312 -> a
+    528:535:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1325:1332 -> a
+    536:536:void com.android.tools.r8.graph.MethodAccessFlags.unsetAbstract():171:171 -> a
+    536:536:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1333 -> a
     537:561:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> a
-    537:561:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1322 -> a
-    562:572:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1323:1333 -> a
+    537:561:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1335 -> a
+    562:572:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1336:1346 -> a
     573:573:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
     573:573:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
-    573:573:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1333 -> a
-    574:585:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1355:1366 -> a
-    586:596:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1365:1375 -> a
-    597:598:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1424:1425 -> a
-    599:600:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1440:1441 -> a
-    601:602:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1456:1457 -> a
-    1:2:boolean hasClassFileVersion():815:816 -> a0
+    573:573:com.android.tools.r8.graph.DexEncodedMethod createDesugaringForwardingMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):1346 -> a
+    574:585:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1368:1379 -> a
+    586:596:com.android.tools.r8.graph.DexCode rewriteCodeWithJumboStrings(com.android.tools.r8.graph.ObjectToOffsetMapping,com.android.tools.r8.graph.DexItemFactory,boolean):1378:1388 -> a
+    597:598:void setOptimizationInfo(com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo):1437:1438 -> a
+    599:600:void joinCallSiteOptimizationInfo(com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo,com.android.tools.r8.graph.AppView):1453:1454 -> a
+    601:602:void setGenericSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):1469:1470 -> a
+    1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> a0
     1:1:boolean com.android.tools.r8.shaking.AnnotationRemover.shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):0:0 -> b
-    1:1:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):398 -> b
+    1:1:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):402 -> b
     2:3:boolean com.android.tools.r8.shaking.AnnotationRemover.isAnnotationTypeLive(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.graph.AppView):137:138 -> b
     2:3:boolean com.android.tools.r8.shaking.AnnotationRemover.shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):67 -> b
-    2:3:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):398 -> b
+    2:3:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):402 -> b
     4:4:boolean com.android.tools.r8.shaking.AnnotationRemover.shouldKeepAnnotation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):66:66 -> b
-    4:4:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):398 -> b
+    4:4:boolean lambda$liveParameterAnnotations$3(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexAnnotation):402 -> b
     5:5:com.android.tools.r8.graph.Code access$400(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> b
-    6:6:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):397:397 -> b
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):918 -> b
-    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():937:944 -> b
-    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):919 -> b
+    6:6:com.android.tools.r8.graph.ParameterAnnotationsList liveParameterAnnotations(com.android.tools.r8.graph.AppView):401:401 -> b
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> b
+    7:7:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):931 -> b
+    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():950:957 -> b
+    8:15:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):932 -> b
     16:16:void setObsolete():196:196 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():945 -> b
-    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):919 -> b
-    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):924:931 -> b
-    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):920 -> b
+    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodCf():958 -> b
+    16:16:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):932 -> b
+    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):937:944 -> b
+    17:24:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):933 -> b
     25:25:void setObsolete():196:196 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):932 -> b
-    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):920 -> b
-    26:29:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):444:447 -> b
-    30:30:void lambda$toInitializerForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):1157:1157 -> b
-    31:34:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1235:1238 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethodDex(boolean):945 -> b
+    25:25:com.android.tools.r8.graph.DexEncodedMethod toEmptyThrowingMethod(com.android.tools.r8.utils.InternalOptions):933 -> b
+    26:29:com.android.tools.r8.graph.ProgramMethod asProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):448:451 -> b
+    30:30:void lambda$toInitializerForwardingBridge$4(com.android.tools.r8.graph.UseRegistry):1170:1170 -> b
+    31:34:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1248:1251 -> b
     35:59:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> b
-    35:59:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1240 -> b
-    60:80:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1242:1262 -> b
-    1:1:boolean hasCode():795:795 -> b0
+    35:59:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1253 -> b
+    60:80:com.android.tools.r8.graph.ProgramMethod toStaticForwardingBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):1255:1275 -> b
+    1:2:boolean hasAnnotation():1415:1416 -> b0
     1:1:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo access$500(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> c
-    2:4:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):422:424 -> c
-    5:6:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1008:1009 -> c
-    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1029:1033 -> c
-    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
-    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1032:1039 -> c
-    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
-    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1038:1044 -> c
-    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
-    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1042:1057 -> c
-    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
+    2:4:boolean isProgramMethod(com.android.tools.r8.graph.DexDefinitionSupplier):426:428 -> c
+    5:6:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1021:1022 -> c
+    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1042:1046 -> c
+    7:11:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1022 -> c
+    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1045:1052 -> c
+    12:19:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1022 -> c
+    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1051:1057 -> c
+    20:26:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1022 -> c
+    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1055:1070 -> c
+    27:42:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1022 -> c
     43:43:void setObsolete():196:196 -> c
-    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1058 -> c
-    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
-    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1059:1059 -> c
-    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1009 -> c
-    45:45:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011:1011 -> c
-    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1063:1067 -> c
-    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1066:1074 -> c
-    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1071:1079 -> c
-    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1076:1084 -> c
-    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1082:1086 -> c
-    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    83:84:boolean isStaticMember():586:587 -> c
-    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1087 -> c
-    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1091:1113 -> c
-    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
+    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1071 -> c
+    43:43:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1022 -> c
+    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorDexCode(com.android.tools.r8.graph.DexItemFactory):1072:1072 -> c
+    44:44:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1022 -> c
+    45:45:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024:1024 -> c
+    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1076:1080 -> c
+    46:50:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1079:1087 -> c
+    51:59:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1084:1092 -> c
+    60:68:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1089:1097 -> c
+    69:77:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1095:1099 -> c
+    78:82:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    83:84:boolean isStaticMember():590:591 -> c
+    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1100 -> c
+    83:84:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1104:1126 -> c
+    85:107:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
     108:108:void setObsolete():196:196 -> c
-    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1114 -> c
-    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1115:1115 -> c
-    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1011 -> c
-    110:113:void lambda$toStaticForwardingBridge$7(com.android.tools.r8.graph.UseRegistry):1250:1253 -> c
-    1:1:boolean hasParameterInfo():762:762 -> c0
+    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1127 -> c
+    108:108:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsErrorCfCode(com.android.tools.r8.graph.DexItemFactory):1128:1128 -> c
+    109:109:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):1024 -> c
+    110:113:void lambda$toStaticForwardingBridge$7(com.android.tools.r8.graph.UseRegistry):1263:1266 -> c
+    1:2:boolean hasClassFileVersion():828:829 -> c0
     1:1:com.android.tools.r8.kotlin.KotlinMethodLevelInfo access$600(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> d
     2:3:com.android.tools.r8.graph.DexMethod getReference():380:381 -> d
     2:3:com.android.tools.r8.graph.DexType getHolderType():367 -> d
     4:4:com.android.tools.r8.graph.DexType getHolderType():367:367 -> d
-    1:1:boolean isAbstract():468:468 -> d0
+    1:1:boolean hasCode():808:808 -> d0
     1:1:com.android.tools.r8.cf.CfVersion access$700(com.android.tools.r8.graph.DexEncodedMethod):92:92 -> e
-    1:2:boolean isClassInitializer():511:512 -> e0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1469:1469 -> f
-    1:1:boolean isD8R8Synthesized():180:180 -> f0
-    1:3:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1445:1447 -> g
-    1:1:boolean isDefaultMethod():517:517 -> g0
+    1:1:boolean hasParameterInfo():775:775 -> e0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1482:1482 -> f
+    1:1:boolean isAbstract():472:472 -> f0
+    1:3:void copyMetadata(com.android.tools.r8.graph.DexEncodedMethod):1458:1460 -> g
+    1:2:boolean isClassInitializer():515:516 -> g0
     1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():201:201 -> getAccessFlags
     1:1:com.android.tools.r8.graph.AccessFlags getAccessFlags():92 -> getAccessFlags
     1:1:int lambda$syntheticCompareTo$0(com.android.tools.r8.graph.DexEncodedMethod):351:351 -> h
-    1:2:boolean isDirectMethod():574:575 -> h0
+    1:1:boolean isD8R8Synthesized():180:180 -> h0
     1:1:com.android.tools.r8.graph.CfCode lambda$syntheticCompareTo$1(com.android.tools.r8.graph.DexEncodedMethod):353:353 -> i
-    1:1:boolean isFinal():476:476 -> i0
+    1:1:boolean isDefaultMethod():521:521 -> i0
     1:1:com.android.tools.r8.graph.DexCode lambda$syntheticCompareTo$2(com.android.tools.r8.graph.DexEncodedMethod):355:355 -> j
-    1:2:boolean isInitializer():496:497 -> j0
+    1:2:boolean isDirectMethod():578:579 -> j0
     1:5:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):213:217 -> k
-    6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():158:158 -> k
+    6:6:void com.android.tools.r8.graph.MethodAccessFlags.setAbstract():167:167 -> k
     6:6:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):217 -> k
     7:8:void setDefaultInterfaceMethodImplementation(com.android.tools.r8.graph.DexEncodedMethod):218:219 -> k
-    1:2:boolean isInstanceInitializer():501:502 -> k0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1465:1465 -> l
-    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():402:402 -> l0
+    1:1:boolean isFinal():480:480 -> k0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder syntheticBuilder(com.android.tools.r8.graph.DexEncodedMethod):1478:1478 -> l
+    1:2:boolean isInitializer():500:501 -> l0
     1:17:int syntheticCompareTo(com.android.tools.r8.graph.DexEncodedMethod):347:363 -> m
     18:22:int syntheticCompareTo(com.android.tools.r8.graph.DexEncodedMethod):357:361 -> m
-    23:24:java.lang.String toSourceString():877:878 -> m
-    1:1:boolean isNative():480:480 -> m0
-    1:2:boolean isNonAbstractNonNativeMethod():546:547 -> n0
-    1:2:boolean isNonAbstractVirtualMethod():541:542 -> o0
-    1:2:boolean isNonPrivateVirtualMethod():532:533 -> p0
-    1:1:boolean isObsolete():190:190 -> q0
-    1:1:boolean isOnlyInlinedIntoNestMembers():625:625 -> r0
-    1:2:boolean isPrivateMethod():566:567 -> s0
-    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1397:1397 -> t
-    1:2:boolean isProcessed():463:464 -> t0
-    1:2:java.lang.String toString():771:772 -> toString
-    1:2:boolean isPublicMethod():556:557 -> u0
+    23:24:java.lang.String toSourceString():890:891 -> m
+    1:2:boolean isInstanceInitializer():505:506 -> m0
+    1:1:com.android.tools.r8.utils.OptionalBool isLibraryMethodOverride():406:406 -> n0
+    1:1:boolean isNative():484:484 -> o0
+    1:2:boolean isNonAbstractNonNativeMethod():550:551 -> p0
+    1:2:boolean isNonAbstractVirtualMethod():545:546 -> q0
+    1:2:boolean isNonPrivateVirtualMethod():536:537 -> r0
+    1:1:boolean isObsolete():190:190 -> s0
+    1:1:com.android.tools.r8.graph.DexEncodedMethod asDexEncodedMethod():1410:1410 -> t
+    1:1:boolean isOnlyInlinedIntoNestMembers():638:638 -> t0
+    1:2:java.lang.String toString():784:785 -> toString
+    1:2:boolean isPrivateMethod():570:571 -> u0
     1:2:com.android.tools.r8.graph.DexMethod getReference():380:381 -> v
     1:2:com.android.tools.r8.graph.DexReference getReference():92 -> v
-    1:2:boolean isPublicized():551:552 -> v0
-    1:1:boolean isSynchronized():492:492 -> w0
-    1:2:boolean isSyntheticMethod():594:595 -> x0
-    1:2:boolean isVirtualMethod():527:528 -> y0
-    1:1:boolean isDexEncodedMethod():1391:1391 -> z
-    1:2:void markNotProcessed():729:730 -> z0
+    1:2:boolean isProcessed():467:468 -> v0
+    1:2:boolean isPublicMethod():560:561 -> w0
+    1:2:boolean isPublicized():555:556 -> x0
+    1:1:boolean isSynchronized():496:496 -> y0
+    1:1:boolean isDexEncodedMethod():1404:1404 -> z
+    1:2:boolean isSyntheticMethod():598:599 -> z0
 com.android.tools.r8.graph.DexEncodedMethod$1 -> com.android.tools.r8.graph.I$a:
 com.android.tools.r8.graph.DexEncodedMethod$Builder -> com.android.tools.r8.graph.I$b:
     com.android.tools.r8.graph.ParameterAnnotationsList parameterAnnotations -> g
@@ -18222,34 +18255,34 @@
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState compilationState -> i
     com.android.tools.r8.graph.MethodAccessFlags accessFlags -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1472:1472 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1472:1472 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1472:1472 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1488:1488 -> <init>
-    4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1491:1491 -> <init>
-    5:37:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1478:1510 -> <init>
-    38:38:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1506:1506 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1472:1472 -> a
-    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1515:1515 -> a
-    3:4:com.android.tools.r8.graph.DexEncodedMethod$Builder setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1519:1520 -> a
-    5:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1525:1526 -> a
-    7:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1544:1563 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1539:1539 -> a
-    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1563 -> a
-    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1566:1568 -> a
-    31:31:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1539:1539 -> a
-    31:31:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1566 -> a
-    32:34:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1588:1590 -> a
-    35:35:void setCode(com.android.tools.r8.graph.Code):1596:1596 -> a
-    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1600:1605 -> b
-    7:9:com.android.tools.r8.graph.DexEncodedMethod build():1604:1606 -> b
+    1:1:void <clinit>():1485:1485 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$1):1485:1485 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean,com.android.tools.r8.graph.DexEncodedMethod$1):1485:1485 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexEncodedMethod):1501:1501 -> <init>
+    4:4:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1504:1504 -> <init>
+    5:37:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1491:1523 -> <init>
+    38:38:void <init>(com.android.tools.r8.graph.DexEncodedMethod,boolean):1519:1519 -> <init>
+    1:1:com.android.tools.r8.graph.MethodAccessFlags access$000(com.android.tools.r8.graph.DexEncodedMethod$Builder):1485:1485 -> a
+    2:2:void setMethod(com.android.tools.r8.graph.DexMethod):1528:1528 -> a
+    3:4:com.android.tools.r8.graph.DexEncodedMethod$Builder setCompilationState(com.android.tools.r8.graph.DexEncodedMethod$CompilationState):1532:1533 -> a
+    5:6:com.android.tools.r8.graph.DexEncodedMethod$Builder setIsLibraryMethodOverride(com.android.tools.r8.utils.OptionalBool):1538:1539 -> a
+    7:26:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1557:1576 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1552:1552 -> a
+    27:27:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1576 -> a
+    28:30:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1579:1581 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod$Builder setParameterAnnotations(com.android.tools.r8.graph.ParameterAnnotationsList):1552:1552 -> a
+    31:31:com.android.tools.r8.graph.DexEncodedMethod$Builder removeParameterAnnotations(java.util.function.IntPredicate):1579 -> a
+    32:34:com.android.tools.r8.graph.DexEncodedMethod$Builder adjustOptimizationInfoAfterRemovingThisParameter():1601:1603 -> a
+    35:35:void setCode(com.android.tools.r8.graph.Code):1609:1609 -> a
+    1:6:com.android.tools.r8.graph.DexEncodedMethod build():1613:1618 -> b
+    7:9:com.android.tools.r8.graph.DexEncodedMethod build():1617:1619 -> b
     10:10:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> b
-    10:10:com.android.tools.r8.graph.DexEncodedMethod build():1606 -> b
-    11:15:com.android.tools.r8.graph.DexEncodedMethod build():1616:1620 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1573:1573 -> c
+    10:10:com.android.tools.r8.graph.DexEncodedMethod build():1619 -> b
+    11:15:com.android.tools.r8.graph.DexEncodedMethod build():1629:1633 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1586:1586 -> c
     2:2:void com.android.tools.r8.graph.AccessFlags.promoteToStatic():232:232 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1573 -> c
-    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1578:1582 -> d
+    2:2:com.android.tools.r8.graph.DexEncodedMethod$Builder promoteToStatic():1586 -> c
+    1:5:com.android.tools.r8.graph.DexEncodedMethod$Builder withoutThisParameter():1591:1595 -> d
 com.android.tools.r8.graph.DexEncodedMethod$CompilationState -> com.android.tools.r8.graph.I$c:
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_NEST -> f
     com.android.tools.r8.graph.DexEncodedMethod$CompilationState PROCESSED_INLINING_CANDIDATE_SAME_CLASS -> g
@@ -18314,186 +18347,184 @@
     com.android.tools.r8.graph.DexString boxedByteDescriptor -> Q
     com.android.tools.r8.graph.DexString invokeExactMethodName -> b1
     com.android.tools.r8.graph.DexType doubleArrayType -> F2
-    com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers androidSystemOsConstantsMembers -> T4
     java.util.Map setFiles -> s
     com.android.tools.r8.graph.DexType strictMathType -> g3
-    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> K5
     com.android.tools.r8.graph.DexString initMethodName -> I0
     com.android.tools.r8.graph.DexString objectArrayDescriptor -> j1
+    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> L4
+    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> x4
+    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> I4
     com.android.tools.r8.graph.DexString hashCodeMethodName -> r0
     com.android.tools.r8.graph.DexString doubleDescriptor -> A
     com.android.tools.r8.graph.DexString runnableDescriptor -> R1
     com.android.tools.r8.graph.DexString valueString -> s2
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> t4
-    java.util.Set libraryMethodsReturningNonNull -> O5
     com.android.tools.r8.graph.DexString unknownTypeName -> b
-    com.android.tools.r8.graph.DexType npeType -> W3
-    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> O4
+    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> W3
     com.android.tools.r8.graph.DexType doubleType -> w2
+    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> G4
     com.android.tools.r8.graph.DexString cloneMethodName -> z0
     com.android.tools.r8.graph.DexString illegalAccessErrorDescriptor -> Z1
-    com.android.tools.r8.graph.DexType streamType -> O3
-    com.android.tools.r8.graph.DexType androidUtilPropertyType -> p4
+    com.android.tools.r8.graph.DexType optionalIntType -> O3
+    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> p4
     com.android.tools.r8.graph.DexString notifyMethodName -> a0
-    com.android.tools.r8.graph.DexType callableType -> G3
+    com.android.tools.r8.graph.DexType collectionType -> G3
     com.android.tools.r8.graph.DexString boxedCharDescriptor -> R
-    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> h4
-    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers androidOsBuildMembers -> Q4
+    com.android.tools.r8.graph.DexType javaUtilLocaleType -> h4
     java.util.Map setInlineFrames -> t
+    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> M4
     com.android.tools.r8.graph.DexString longFieldUpdaterDescriptor -> j2
+    com.android.tools.r8.graph.DexType externalizableType -> H5
     com.android.tools.r8.graph.DexString listDescriptor -> I1
     com.android.tools.r8.graph.DexString unboxFloatMethodName -> i0
-    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> P4
     com.android.tools.r8.graph.DexString consumerDescriptor -> Q1
     com.android.tools.r8.graph.DexString throwableArrayDescriptor -> r2
-    com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers javaNioByteOrderMembers -> X4
     com.android.tools.r8.graph.DexString getCanonicalNameName -> Q0
     com.android.tools.r8.graph.DexString enumDescriptor -> r1
     com.android.tools.r8.graph.DexString floatDescriptor -> B
-    com.android.tools.r8.graph.DexType metafactoryType -> y5
+    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> y5
     com.android.tools.r8.graph.DexType stringArrayType -> W2
-    com.android.tools.r8.graph.DexType serviceLoaderRewrittenClassType -> x3
+    com.android.tools.r8.graph.DexType proxyType -> x3
     com.android.tools.r8.graph.DexString newInstanceName -> Y0
     com.android.tools.r8.graph.DexString stringBuilderDescriptor -> z1
-    com.android.tools.r8.graph.DexType annotationThrows -> q5
+    com.android.tools.r8.graph.DexType annotationSignature -> q5
     com.android.tools.r8.graph.DexType boxedFloatType -> O2
-    com.android.tools.r8.graph.DexType javaLangSystemType -> p3
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers javaUtilLoggingLevelMembers -> c5
+    com.android.tools.r8.graph.DexType stringBuilderType -> p3
     com.android.tools.r8.graph.DexString icceDescriptor -> b2
     com.android.tools.r8.graph.DexString stringBufferDescriptor -> A1
+    java.util.List libraryMembersCollection -> f5
     com.android.tools.r8.graph.DexString boxedDoubleDescriptor -> S
     com.android.tools.r8.graph.DexType mathType -> f3
-    com.android.tools.r8.graph.DexMethod metafactoryMethod -> J5
     com.android.tools.r8.graph.DexString objectDescriptor -> i1
     com.android.tools.r8.graph.DexType charArrayType -> E2
     com.android.tools.r8.graph.DexString wrapperFieldName -> H0
+    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> K4
     com.android.tools.r8.graph.DexString getNameName -> P0
     com.android.tools.r8.graph.DexString methodDescriptor -> q1
-    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> w4
-    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> u4
     com.android.tools.r8.graph.DexString equalsMethodName -> q0
     com.android.tools.r8.graph.DexType charType -> v2
     com.android.tools.r8.graph.DexString intDescriptor -> C
-    com.android.tools.r8.graph.DexType icceType -> V3
+    com.android.tools.r8.graph.DexType throwableType -> V3
     com.android.tools.r8.graph.DexString throwableDescriptor -> Y1
-    java.util.Set libraryMethodsReturningReceiver -> N5
     com.android.tools.r8.graph.DexString compareToIgnoreCaseMethodName -> y0
-    com.android.tools.r8.graph.DexType optionalLongType -> N3
-    com.android.tools.r8.graph.DexType androidUtilLogType -> o4
+    com.android.tools.r8.graph.DexType stringConcatFactoryType -> O5
+    com.android.tools.r8.graph.DexType optionalDoubleType -> N3
+    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> o4
     com.android.tools.r8.graph.DexString invokeMethodName -> a1
+    com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers javaIoFileMembers -> X4
     com.android.tools.r8.graph.DexString boxedFloatDescriptor -> T
-    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> g4
+    com.android.tools.r8.graph.DexType javaUtilListType -> g4
     com.android.tools.r8.graph.DexString unboxLongMethodName -> h0
     com.android.tools.r8.graph.DexString serviceLoaderConfigurationErrorDescriptor -> H1
-    com.android.tools.r8.graph.DexType comparatorType -> F3
+    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> F3
     com.android.tools.r8.graph.DexString intFieldUpdaterDescriptor -> i2
-    com.android.tools.r8.graph.DexType comparableType -> G5
-    com.android.tools.r8.graph.DexString nestConstructorDescriptor -> r4
+    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> H4
+    com.android.tools.r8.graph.DexType serializableType -> G5
     com.android.tools.r8.graph.DexString endsWithMethodName -> p0
     com.android.tools.r8.graph.DexString supplierDescriptor -> P1
     com.android.tools.r8.graph.DexString enabledFieldName -> q2
-    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> x4
     com.android.tools.r8.graph.DexType stringType -> V2
-    com.android.tools.r8.graph.DexType serviceLoaderType -> w3
-    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> H4
+    com.android.tools.r8.graph.DexType invocationHandlerType -> w3
+    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> K5
     com.android.tools.r8.graph.DexString longDescriptor -> D
-    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> x5
+    boolean skipNameValidationForTesting -> U5
+    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> x5
     com.android.tools.r8.graph.DexString getDeclaredMethodName -> X0
     com.android.tools.r8.graph.DexString strictMathDescriptor -> y1
-    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> B4
+    com.android.tools.r8.graph.DexItemFactory$DoubleMethods doubleMethods -> E4
     com.android.tools.r8.graph.DexType boxedDoubleType -> N2
-    com.android.tools.r8.graph.DexType stringBufferType -> o3
+    com.android.tools.r8.graph.DexType autoCloseableType -> o3
     java.util.Map strings -> f
-    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> p5
+    com.android.tools.r8.graph.DexType annotationMethodParameters -> p5
     com.android.tools.r8.graph.DexString illegalArgumentExceptionDescriptor -> a2
+    com.android.tools.r8.kotlin.Kotlin kotlin -> P4
     com.android.tools.r8.graph.DexString valueOfMethodName -> C0
     java.util.concurrent.ConcurrentHashMap referenceTypes -> u
     com.android.tools.r8.graph.DexString assertionErrorDescriptor -> d1
     com.android.tools.r8.graph.DexType iterableType -> e3
+    com.android.tools.r8.graph.DexMethod metafactoryAltMethod -> M5
     com.android.tools.r8.graph.DexType byteArrayType -> D2
-    com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods npeMethods -> J4
     com.android.tools.r8.graph.DexString finalizeMethodName -> K0
     com.android.tools.r8.graph.DexString classLoaderDescriptor -> l1
+    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> A4
     com.android.tools.r8.graph.DexString equalsIgnoreCaseMethodName -> t0
-    com.android.tools.r8.graph.DexItemFactory$BooleanMembers booleanMembers -> v4
     com.android.tools.r8.graph.DexString optionalDoubleDescriptor -> T1
-    java.util.Set libraryTypesAssumedToBePresent -> Q5
-    com.android.tools.r8.graph.DexType illegalArgumentExceptionType -> U3
+    java.util.Set libraryMethodsReturningNonNull -> Q5
+    com.android.tools.r8.graph.DexType runtimeExceptionType -> U3
+    com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods polymorphicMethods -> Q4
     com.android.tools.r8.graph.DexType byteType -> u2
-    com.android.tools.r8.graph.DexType optionalIntType -> M3
-    com.android.tools.r8.graph.DexType androidSystemOsConstantsType -> n4
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBuilderMethods -> v4
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> a5
+    com.android.tools.r8.graph.DexType optionalType -> M3
+    com.android.tools.r8.graph.DexType androidOsBundleType -> n4
     com.android.tools.r8.graph.DexString intArrayDescriptor -> M
     com.android.tools.r8.graph.DexString noClassDefFoundErrorDescriptor -> d2
+    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> N4
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers androidOsBuildMembers -> S4
     com.android.tools.r8.graph.DexString methodHandleDescriptor -> C1
     com.android.tools.r8.graph.DexString unboxBooleanMethodName -> c0
-    com.android.tools.r8.graph.DexType javaUtilLocaleType -> f4
-    com.android.tools.r8.graph.DexType externalizableType -> F5
-    com.android.tools.r8.graph.DexType collectionType -> E3
+    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> f4
+    com.android.tools.r8.graph.DexType enumerationType -> F5
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers javaUtilConcurrentTimeUnitMembers -> c5
+    com.android.tools.r8.graph.DexType mapEntryType -> E3
     com.android.tools.r8.graph.DexString newUpdaterName -> l2
     com.android.tools.r8.graph.DexString mapDescriptor -> K1
-    com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers androidViewViewMembers -> U4
     com.android.tools.r8.graph.DexString isEmptyMethodName -> k0
     com.android.tools.r8.graph.DexString getTypeNameName -> S0
     com.android.tools.r8.graph.DexString annotationDescriptor -> t1
-    com.android.tools.r8.graph.DexType dalvikFastNativeAnnotation -> w5
+    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> w5
     com.android.tools.r8.graph.DexType charSequenceArrayType -> U2
-    com.android.tools.r8.graph.DexType proxyType -> v3
+    com.android.tools.r8.graph.DexType methodTypeType -> v3
     com.android.tools.r8.utils.LRUCacheTable leastUpperBoundOfInterfacesTable -> w
-    com.android.tools.r8.graph.DexType annotationSignature -> o5
+    com.android.tools.r8.graph.DexType annotationMemberClasses -> o5
     com.android.tools.r8.graph.DexType boxedCharType -> M2
-    com.android.tools.r8.graph.DexType stringBuilderType -> n3
-    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> z4
+    com.android.tools.r8.graph.DexType methodType -> n3
     com.android.tools.r8.graph.DexString longArrayDescriptor -> N
     com.android.tools.r8.graph.DexString runtimeExceptionDescriptor -> c1
     com.android.tools.r8.graph.DexString trimName -> B0
     com.android.tools.r8.graph.DexType booleanArrayType -> C2
     com.android.tools.r8.graph.DexType collectionsType -> d3
-    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> L5
+    com.android.tools.r8.graph.DexMethod metafactoryMethod -> L5
     com.android.tools.r8.graph.DexString classDescriptor -> k1
     com.android.tools.r8.graph.DexString getClassMethodName -> J0
-    com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods javaLangSystemMethods -> I4
-    com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers javaMathBigIntegerMembers -> W4
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods javaUtilArraysMethods -> Y4
     com.android.tools.r8.graph.DexString optionalDescriptor -> S1
-    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> P5
+    java.util.Set libraryMethodsReturningReceiver -> P5
     com.android.tools.r8.graph.DexString identityHashCodeName -> s0
     com.android.tools.r8.graph.DexType booleanType -> t2
-    com.android.tools.r8.graph.DexType throwableType -> T3
-    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> e5
-    com.android.tools.r8.graph.DexType stringConcatFactoryType -> M5
+    com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods stringBufferMethods -> w4
+    com.android.tools.r8.graph.DexType intConsumer -> T3
+    com.android.tools.r8.graph.DexType nestConstructorType -> u4
     com.android.tools.r8.graph.DexString shortArrayDescriptor -> O
-    com.android.tools.r8.graph.DexType optionalDoubleType -> L3
-    com.android.tools.r8.graph.DexType androidOsParcelableCreatorType -> m4
+    com.android.tools.r8.graph.DexType runnableType -> L3
+    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> m4
     com.android.tools.r8.graph.DexString boxedBooleanDescriptor -> P
     com.android.tools.r8.graph.DexString notifyAllMethodName -> b0
     com.android.tools.r8.graph.DexString varHandleDescriptor -> B1
     com.android.tools.r8.graph.DexString exceptionInInitializerErrorDescriptor -> c2
-    com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers javaIoFileMembers -> V4
-    com.android.tools.r8.graph.DexType abstractMapSimpleEntryType -> D3
-    com.android.tools.r8.graph.DexType serializableType -> E5
-    com.android.tools.r8.graph.DexType javaUtilListType -> e4
+    com.android.tools.r8.graph.DexType mapType -> D3
+    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> J5
+    com.android.tools.r8.graph.DexType listIteratorType -> E5
+    com.android.tools.r8.graph.DexType javaUtilComparatorType -> e4
     com.android.tools.r8.graph.DexString unboxDoubleMethodName -> j0
     com.android.tools.r8.graph.DexString setDescriptor -> J1
     com.android.tools.r8.graph.DexString referenceFieldUpdaterDescriptor -> k2
-    com.android.tools.r8.graph.DexItemFactory$ClassMethods classMethods -> F4
+    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> j5
+    com.android.tools.r8.graph.DexString nestConstructorDescriptor -> t4
     com.android.tools.r8.graph.DexString getSimpleNameName -> R0
     com.android.tools.r8.graph.DexString javaLangSystemDescriptor -> s1
-    com.android.tools.r8.com.google.common.collect.BiMap primitiveToBoxed -> I5
+    com.android.tools.r8.graph.DexItemFactory$EnumMembers enumMembers -> J4
     com.android.tools.r8.graph.DexType charSequenceType -> T2
-    com.android.tools.r8.graph.DexType invocationHandlerType -> u3
-    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> A4
-    com.android.tools.r8.graph.DexType annotationReachabilitySensitive -> v5
+    com.android.tools.r8.graph.DexType methodHandleType -> u3
+    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> v5
     com.android.tools.r8.graph.DexString assertionsDisabled -> Z0
     com.android.tools.r8.graph.DexType boxedByteType -> L2
-    com.android.tools.r8.graph.DexType autoCloseableType -> m3
-    com.android.tools.r8.kotlin.Kotlin kotlin -> N4
-    com.android.tools.r8.graph.DexType annotationMethodParameters -> n5
-    com.android.tools.r8.graph.DexType annotationInnerClass -> l5
+    com.android.tools.r8.graph.DexType fieldType -> m3
+    com.android.tools.r8.graph.DexType annotationInnerClass -> n5
+    com.android.tools.r8.graph.DexType annotationEnclosingClass -> l5
     com.android.tools.r8.graph.DexString toStringMethodName -> E0
-    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers androidOsBuildVersionMembers -> R4
     com.android.tools.r8.graph.DexString charSequenceArrayDescriptor -> f1
     com.android.tools.r8.graph.DexType voidType -> B2
     com.android.tools.r8.graph.DexType objectsType -> c3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers javaUtilLocaleMembers -> d5
     com.android.tools.r8.graph.DexString boxedVoidDescriptor -> Y
     com.android.tools.r8.graph.DexString charDescriptor -> z
     com.android.tools.r8.graph.DexString nameMethodName -> M0
@@ -18501,286 +18532,299 @@
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advancePCs -> m
     com.android.tools.r8.graph.DexString indexOfMethodName -> v0
     com.android.tools.r8.graph.DexString optionalLongDescriptor -> V1
-    com.android.tools.r8.graph.DexType runtimeExceptionType -> S3
+    com.android.tools.r8.graph.DexType longConsumer -> S3
     com.android.tools.r8.graph.DexString byteArrayDescriptor -> I
     java.util.Map methodHandles -> k
     com.android.tools.r8.graph.DexType nullValueType -> a
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers javaUtilConcurrentTimeUnitMembers -> a5
-    com.android.tools.r8.graph.DexType optionalType -> K3
-    com.android.tools.r8.graph.DexType androidOsBundleType -> l4
+    com.android.tools.r8.graph.DexType consumerType -> K3
+    com.android.tools.r8.graph.DexType androidOsBuildType -> l4
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers androidOsBundleMembers -> U4
     com.android.tools.r8.graph.DexString npeDescriptor -> f2
-    com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields primitiveTypesBoxedTypeFields -> L4
     com.android.tools.r8.graph.DexString invocationHandlerDescriptor -> E1
     com.android.tools.r8.graph.DexString unboxCharMethodName -> e0
-    com.android.tools.r8.graph.DexType mapEntryType -> C3
-    com.android.tools.r8.graph.DexType javaUtilConcurrentTimeUnitType -> d4
+    com.android.tools.r8.graph.DexType setType -> C3
+    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> d4
+    com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers androidViewViewMembers -> W4
     com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin setEpilogueBegin -> q
     com.android.tools.r8.graph.DexString waitMethodName -> Z
     com.android.tools.r8.graph.DexString collectionDescriptor -> M1
     com.android.tools.r8.graph.DexString classConstructorMethodName -> n2
-    com.android.tools.r8.graph.DexType enumerationType -> D5
+    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> F4
+    com.android.tools.r8.graph.DexType iteratorType -> D5
     com.android.tools.r8.graph.DexString concatMethodName -> m0
+    java.util.Set libraryTypesAssumedToBePresent -> S5
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap defaults -> n
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers javaUtilComparatorMembers -> Z4
     com.android.tools.r8.graph.DexString getFieldName -> U0
     com.android.tools.r8.graph.DexString collectionsDescriptor -> v1
-    com.android.tools.r8.graph.DexType annotationCovariantReturnTypes -> u5
+    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> u5
     com.android.tools.r8.graph.DexType boxedNumberType -> S2
-    com.android.tools.r8.graph.DexType methodTypeType -> t3
+    com.android.tools.r8.graph.DexType varHandleType -> t3
     com.android.tools.r8.graph.DexString charArrayDescriptor -> J
-    com.android.tools.r8.graph.DexType annotationMemberClasses -> m5
+    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> m5
     com.android.tools.r8.graph.DexType boxedBooleanType -> K2
-    com.android.tools.r8.graph.DexType methodType -> l3
-    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> g5
-    com.android.tools.r8.graph.DexType annotationEnclosingMethod -> k5
-    com.android.tools.r8.graph.DexType classLoaderType -> j3
+    com.android.tools.r8.graph.DexType constructorType -> l3
+    com.android.tools.r8.graph.DexString twrCloseResourceMethodName -> g5
+    com.android.tools.r8.graph.DexType annotationDefault -> k5
+    com.android.tools.r8.graph.DexType packageType -> j3
     com.android.tools.r8.graph.DexString charSequenceDescriptor -> e1
     com.android.tools.r8.graph.DexType longArrayType -> I2
     com.android.tools.r8.graph.DexString valuesMethodName -> D0
     com.android.tools.r8.graph.DexType annotationType -> b3
+    com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers javaMathBigIntegerMembers -> Y4
+    com.android.tools.r8.graph.DexMethod deserializeLambdaMethod -> N5
     com.android.tools.r8.graph.DexString ordinalMethodName -> L0
     com.android.tools.r8.graph.DexString autoCloseableDescriptor -> m1
     com.android.tools.r8.graph.DexType shortType -> A2
     com.android.tools.r8.graph.DexType longType -> z2
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers javaUtilComparatorMembers -> b5
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap endLocals -> o
-    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> Z3
+    com.android.tools.r8.graph.DexType kotlinMetadataType -> Z3
     com.android.tools.r8.graph.DexString optionalIntDescriptor -> U1
-    java.util.Set libraryClassesWithoutStaticInitialization -> R5
+    java.util.Set libraryMethodsWithReturnValueDependingOnlyOnArguments -> R5
     com.android.tools.r8.graph.DexString contentEqualsMethodName -> u0
     java.util.Set possibleCompilerSynthesizedTypes -> e
-    com.android.tools.r8.graph.DexType intConsumer -> R3
-    com.android.tools.r8.graph.DexType nestConstructorType -> s4
+    com.android.tools.r8.graph.DexType doubleConsumer -> R3
+    com.android.tools.r8.graph.DexType androidViewViewType -> s4
     com.android.tools.r8.graph.DexString doubleArrayDescriptor -> K
-    com.android.tools.r8.graph.DexType androidOsBuildVersionType -> k4
+    com.android.tools.r8.graph.DexType javaUtilSetType -> k4
     java.util.concurrent.ConcurrentHashMap classTypeInterfaces -> v
     com.android.tools.r8.graph.DexString unboxByteMethodName -> d0
     com.android.tools.r8.graph.DexString methodTypeDescriptor -> D1
-    com.android.tools.r8.graph.DexType runnableType -> J3
+    com.android.tools.r8.graph.DexType supplierType -> J3
     com.android.tools.r8.graph.DexString noSuchFieldErrorDescriptor -> e2
-    com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods serviceLoaderMethods -> H5
-    com.android.tools.r8.graph.DexProto deserializeLambdaMethodProto -> h5
-    com.android.tools.r8.graph.DexType javaUtilComparatorType -> c4
+    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> h5
+    com.android.tools.r8.graph.DexType javaNioByteOrderType -> c4
     com.android.tools.r8.graph.DexString lengthMethodName -> l0
-    com.android.tools.r8.graph.DexType mapType -> B3
+    com.android.tools.r8.graph.DexType listType -> B3
     com.android.tools.r8.graph.DexString mapEntryDescriptor -> L1
     com.android.tools.r8.graph.DexString constructorMethodName -> m2
-    com.android.tools.r8.graph.DexType listIteratorType -> C5
+    com.android.tools.r8.graph.DexType lookupType -> C5
+    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> O4
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap restartLocals -> p
     com.android.tools.r8.graph.DexType classArrayType -> Z2
     com.android.tools.r8.graph.DexString getDeclaredConstructorName -> T0
     com.android.tools.r8.graph.DexString objectsDescriptor -> u1
-    com.android.tools.r8.graph.DexItemFactory$ObjectsMethods objectsMethods -> y4
+    com.android.tools.r8.graph.DexItemFactory$StringMembers stringMembers -> C4
     com.android.tools.r8.graph.DexType boxedShortType -> R2
-    com.android.tools.r8.graph.DexType methodHandleType -> s3
+    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> s3
     com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd setPrologueEnd -> r
-    com.android.tools.r8.graph.DexType annotationCovariantReturnType -> t5
+    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> t5
+    com.android.tools.r8.graph.DexItemFactory$ObjectMembers objectMembers -> B4
     com.android.tools.r8.graph.DexString floatArrayDescriptor -> L
     com.android.tools.r8.graph.DexType shortArrayType -> J2
-    com.android.tools.r8.graph.DexType fieldType -> k3
+    com.android.tools.r8.graph.DexType classLoaderType -> k3
     com.android.tools.r8.graph.DexType classType -> i3
-    com.android.tools.r8.graph.DexItemFactory$ConstructorMethods constructorMethods -> G4
     com.android.tools.r8.graph.DexType intArrayType -> H2
-    com.android.tools.r8.graph.DexType annotationEnclosingClass -> j5
+    com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers androidSystemOsConstantsMembers -> V4
     com.android.tools.r8.graph.DexString boxedIntDescriptor -> U
-    com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers javaUtilLocaleMembers -> b5
     com.android.tools.r8.graph.DexString convertMethodName -> G0
+    com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers androidOsBuildVersionMembers -> T4
     com.android.tools.r8.graph.DexString stringArrayDescriptor -> h1
     com.android.tools.r8.graph.DexType enumType -> a3
     com.android.tools.r8.graph.DexString forNameMethodName -> O0
     com.android.tools.r8.graph.DexString fieldDescriptor -> p1
-    com.android.tools.r8.graph.DexType javaIoFileType -> Y3
+    com.android.tools.r8.graph.DexType npeType -> Y3
     com.android.tools.r8.graph.DexType intType -> y2
-    com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods assertionErrorMethods -> E4
     com.android.tools.r8.graph.DexString shortDescriptor -> E
     com.android.tools.r8.graph.DexString compareToMethodName -> x0
     com.android.tools.r8.graph.DexString arraysDescriptor -> X1
-    com.android.tools.r8.graph.DexType longConsumer -> Q3
+    com.android.tools.r8.graph.DexType streamType -> Q3
+    com.android.tools.r8.graph.DexType androidUtilPropertyType -> r4
     java.util.Map types -> g
     boolean $assertionsDisabled -> d
-    com.android.tools.r8.graph.DexType androidOsBuildType -> j4
-    com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods illegalArgumentExceptionMethods -> K4
-    com.android.tools.r8.graph.DexType consumerType -> I3
+    com.android.tools.r8.graph.DexType javaUtilLoggingLoggerType -> j4
+    com.android.tools.r8.graph.DexType callableType -> I3
     com.android.tools.r8.graph.DexString kotlinMetadataDescriptor -> h2
     com.android.tools.r8.graph.DexString serviceLoaderDescriptor -> G1
     com.android.tools.r8.graph.DexString boxedLongDescriptor -> V
     com.android.tools.r8.graph.DexString unboxIntMethodName -> g0
-    com.android.tools.r8.graph.DexType javaUtilCollectionsType -> b4
-    com.android.tools.r8.graph.DexItemFactory$ThrowableMethods throwableMethods -> D4
-    com.android.tools.r8.graph.DexType iteratorType -> B5
-    com.android.tools.r8.graph.DexType setType -> A3
+    com.android.tools.r8.graph.DexType javaMathBigIntegerType -> b4
+    com.android.tools.r8.graph.DexType callSiteType -> B5
+    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> A3
     com.android.tools.r8.graph.DexString callableDescriptor -> O1
     com.android.tools.r8.graph.DexString enumValuesFieldName -> p2
+    com.android.tools.r8.graph.DexItemFactory$ProxyMethods proxyMethods -> R4
+    com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers javaNioByteOrderMembers -> Z4
     com.android.tools.r8.graph.DexString startsWithMethodName -> o0
     com.android.tools.r8.graph.DexType objectArrayType -> Y2
-    com.android.tools.r8.graph.DexType listType -> z3
+    com.android.tools.r8.graph.DexType serviceLoaderRewrittenClassType -> z3
     com.android.tools.r8.graph.DexString voidDescriptor -> F
     com.android.tools.r8.graph.DexString getMethodName -> W0
     com.android.tools.r8.graph.DexString mathDescriptor -> x1
-    com.android.tools.r8.graph.DexType annotationSynthesizedClassMap -> s5
+    com.android.tools.r8.graph.DexType annotationThrows -> s5
     com.android.tools.r8.graph.DexType boxedLongType -> Q2
-    com.android.tools.r8.graph.DexType varHandleType -> r3
+    com.android.tools.r8.graph.DexType javaLangSystemType -> r3
+    com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers javaUtilLoggingLevelMembers -> e5
     java.util.IdentityHashMap internalSentinels -> c
     java.util.Map fields -> h
     com.android.tools.r8.graph.DexType floatArrayType -> G2
-    java.util.List libraryMembersCollection -> d5
-    com.android.tools.r8.graph.DexType annotationDefault -> i5
+    com.android.tools.r8.graph.DexString deserializeLambdaMethodName -> i5
     com.android.tools.r8.graph.DexType referenceFieldUpdaterType -> h3
     com.android.tools.r8.graph.DexString stringDescriptor -> g1
     com.android.tools.r8.graph.DexString internMethodName -> F0
     com.android.tools.r8.graph.DexString boxedShortDescriptor -> W
     com.android.tools.r8.graph.DexString booleanDescriptor -> x
+    com.android.tools.r8.graph.DexItemFactory$FloatMembers floatMembers -> y4
     com.android.tools.r8.graph.DexString desiredAssertionStatusMethodName -> N0
     com.android.tools.r8.graph.DexString constructorDescriptor -> o1
     com.android.tools.r8.graph.DexType floatType -> x2
-    com.android.tools.r8.graph.DexType kotlinMetadataType -> X3
+    com.android.tools.r8.graph.DexType icceType -> X3
     com.android.tools.r8.graph.DexString streamDescriptor -> W1
     com.android.tools.r8.graph.DexString descriptorSeparator -> G
     com.android.tools.r8.graph.DexString lastIndexOfMethodName -> w0
     java.util.Map protos -> i
-    com.android.tools.r8.graph.DexType doubleConsumer -> P3
-    com.android.tools.r8.graph.DexType androidViewViewType -> q4
-    com.android.tools.r8.graph.DexType supplierType -> H3
-    com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers androidOsBundleMembers -> S4
-    com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods atomicFieldUpdaterMethods -> M4
-    com.android.tools.r8.graph.DexType javaUtilSetType -> i4
+    com.android.tools.r8.graph.DexType optionalLongType -> P3
+    com.android.tools.r8.graph.DexType androidUtilLogType -> q4
+    com.android.tools.r8.graph.DexType comparatorType -> H3
+    com.android.tools.r8.graph.DexType comparableType -> I5
+    com.android.tools.r8.graph.DexType javaUtilLoggingLevelType -> i4
     com.android.tools.r8.graph.DexString unboxShortMethodName -> f0
     com.android.tools.r8.graph.DexString proxyDescriptor -> F1
     com.android.tools.r8.graph.DexString reflectiveOperationExceptionDescriptor -> g2
     com.android.tools.r8.graph.DexString boxedNumberDescriptor -> X
     com.android.tools.r8.graph.DexString byteDescriptor -> y
-    com.android.tools.r8.graph.DexType lookupType -> A5
-    com.android.tools.r8.graph.DexType javaNioByteOrderType -> a4
+    com.android.tools.r8.graph.DexType metafactoryType -> A5
+    com.android.tools.r8.graph.DexType javaIoFileType -> a4
     com.android.tools.r8.graph.DexString containsMethodName -> n0
+    java.util.Set libraryClassesWithoutStaticInitialization -> T5
     com.android.tools.r8.graph.DexString comparatorDescriptor -> N1
     com.android.tools.r8.graph.DexString thisName -> o2
-    com.android.tools.r8.graph.DexProto twrCloseResourceMethodProto -> f5
     com.android.tools.r8.graph.DexType objectType -> X2
-    com.android.tools.r8.graph.DexType serviceLoaderConfigurationErrorType -> y3
+    com.android.tools.r8.graph.DexType serviceLoaderType -> y3
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap advanceLines -> l
-    com.android.tools.r8.graph.DexType callSiteType -> z5
+    com.android.tools.r8.graph.DexType dalvikCriticalNativeAnnotation -> z5
     com.android.tools.r8.graph.DexString getDeclaredFieldName -> V0
     com.android.tools.r8.graph.DexString iterableDescriptor -> w1
+    com.android.tools.r8.graph.DexItemFactory$LongMembers longMembers -> D4
+    com.android.tools.r8.graph.DexItemFactory$IntegerMembers integerMembers -> z4
     com.android.tools.r8.graph.DexString booleanArrayDescriptor -> H
     com.android.tools.r8.graph.DexType boxedIntType -> P2
-    com.android.tools.r8.graph.DexType javaIoPrintStreamType -> q3
+    com.android.tools.r8.graph.DexType stringBufferType -> q3
     java.util.Map methods -> j
-    boolean skipNameValidationForTesting -> S5
-    com.android.tools.r8.graph.DexItemFactory$DoubleMethods doubleMethods -> C4
-    com.android.tools.r8.graph.DexType annotationSynthesizedClass -> r5
-    1:45:void <clinit>():58:102 -> <clinit>
-    1:1:void <init>():106:106 -> <init>
-    2:527:void <init>():64:589 -> <init>
-    528:576:void <init>():579:627 -> <init>
-    577:593:void <init>():617:633 -> <init>
-    594:615:void <init>():630:651 -> <init>
-    616:636:void <init>():642:662 -> <init>
-    637:693:void <init>():655:711 -> <init>
-    694:694:void <init>():107:107 -> <init>
-    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$4(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
-    1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):111:111 -> a
+    com.android.tools.r8.graph.DexType annotationSourceDebugExtension -> r5
+    1:45:void <clinit>():59:103 -> <clinit>
+    1:1:void <init>():107:107 -> <init>
+    2:529:void <init>():65:592 -> <init>
+    530:578:void <init>():582:630 -> <init>
+    579:595:void <init>():620:636 -> <init>
+    596:617:void <init>():633:654 -> <init>
+    618:638:void <init>():645:665 -> <init>
+    639:695:void <init>():658:714 -> <init>
+    696:696:void <init>():108:108 -> <init>
+    com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame lambda$createSetInlineFrame$5(com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame) -> a
+    1:1:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
     2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):179:179 -> a
-    2:2:java.util.Optional lambda$createFreshFieldName$2(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1860 -> a
-    3:3:java.util.Optional lambda$createFreshFieldName$2(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1860:1860 -> a
-    4:15:java.util.Set boxedValueOfMethods():602:613 -> a
-    16:18:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):605:607 -> a
-    19:19:void setSkipNameValidationForTesting(boolean):714:714 -> a
-    20:20:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1734:1734 -> a
-    21:21:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):111:111 -> a
-    21:21:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1735 -> a
-    22:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1735:1736 -> a
-    24:24:com.android.tools.r8.graph.DexString createString(int,byte[]):1742:1742 -> a
-    25:27:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1755:1757 -> a
-    28:28:java.lang.String escapeMemberString(java.lang.String):1751:1751 -> a
-    28:28:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1757 -> a
-    29:36:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1757:1764 -> a
-    37:40:com.android.tools.r8.graph.DexMember createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):1777:1780 -> a
-    41:41:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1804:1804 -> a
-    42:42:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1891:1891 -> a
-    42:42:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1805 -> a
-    43:43:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1807:1807 -> a
-    44:45:com.android.tools.r8.graph.DexMethod createFreshMethodName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1834:1835 -> a
-    46:50:java.util.Optional lambda$createFreshMethodName$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1837:1841 -> a
-    51:54:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1858:1861 -> a
-    55:55:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1859:1859 -> a
-    56:56:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1868:1868 -> a
-    57:57:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    57:57:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1868 -> a
-    58:59:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1868:1869 -> a
-    60:64:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Function):1878:1882 -> a
-    60:64:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1869 -> a
-    65:65:java.util.Optional lambda$createInstanceInitializerWithFreshProto$3(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):1872:1872 -> a
-    66:66:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1926:1926 -> a
-    67:69:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1930:1932 -> a
-    67:69:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1926 -> a
-    70:74:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):1951:1955 -> a
-    75:76:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):1981:1982 -> a
-    77:79:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):1986:1988 -> a
-    80:80:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):1992:1992 -> a
-    81:82:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):1997:1998 -> a
-    83:86:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2002:2005 -> a
-    87:92:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2080:2085 -> a
-    87:92:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2006 -> a
-    93:93:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2003:2003 -> a
-    94:94:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2010:2010 -> a
-    95:98:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2024:2027 -> a
-    99:101:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2026:2028 -> a
-    102:104:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2032:2034 -> a
-    105:108:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2033:2036 -> a
-    109:113:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2046:2050 -> a
-    114:123:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2067:2076 -> a
-    114:123:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2050 -> a
-    124:130:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2051:2057 -> a
-    131:135:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2056:2060 -> a
-    136:138:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2089:2091 -> a
-    139:139:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2095:2095 -> a
-    140:140:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2103:2103 -> a
-    141:141:void com.android.tools.r8.graph.DexMethodHandle.<init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):209:209 -> a
-    141:141:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2103 -> a
-    142:142:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2104:2104 -> a
-    143:144:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2113:2114 -> a
-    145:154:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2122:2131 -> a
-    155:157:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2135:2137 -> a
-    158:160:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2173:2175 -> a
-    161:163:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2180:2182 -> a
-    164:164:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2190:2190 -> a
-    165:172:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2223:2230 -> a
-    173:201:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2229:2257 -> a
-    202:210:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2237:2245 -> a
-    211:222:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2244:2255 -> a
-    223:223:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2262:2262 -> a
-    224:225:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$6(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2265:2266 -> a
-    226:226:void forAllTypes(java.util.function.Consumer):2272:2272 -> a
-    1:2:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):592:593 -> b
-    3:4:com.android.tools.r8.graph.DexString createString(java.lang.String):1746:1747 -> b
-    5:5:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1887:1887 -> b
-    6:8:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1930:1932 -> b
-    9:9:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):1964:1964 -> b
-    10:12:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2014:2016 -> b
-    13:15:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2141:2143 -> b
-    16:16:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2186:2186 -> b
-    17:19:void clearTypeElementsCache():2194:2196 -> b
-    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):722:722 -> c
-    2:3:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):1939:1940 -> c
-    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):1960:1960 -> c
-    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):1969:1969 -> c
-    6:8:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2147:2149 -> c
-    9:9:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2165:2165 -> c
-    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1910:1918 -> d
-    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1915:1915 -> d
-    11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):111:111 -> d
-    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1919 -> d
-    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1919:1920 -> d
-    14:14:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):1947:1947 -> d
-    15:15:com.android.tools.r8.graph.DexType createType(java.lang.String):1973:1973 -> d
-    16:16:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2020:2020 -> d
-    17:19:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2153:2155 -> d
-    20:20:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2169:2169 -> d
-    1:1:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1891:1891 -> e
-    2:6:java.util.List extractMarkers():1898:1902 -> e
-    7:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):1977:1977 -> e
-    8:10:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2159:2161 -> e
-    1:1:boolean getSkipNameValidationForTesting():718:718 -> f
-    1:3:boolean verifyNoCachedTypeElements():2200:2202 -> g
+    2:2:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1905 -> a
+    3:3:java.util.Optional lambda$internalCreateFreshFieldName$3(com.android.tools.r8.graph.DexField,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1905:1905 -> a
+    4:15:java.util.Set boxedValueOfMethods():605:616 -> a
+    16:18:com.android.tools.r8.graph.DexMethod lambda$boxedValueOfMethods$0(java.util.Map$Entry):608:610 -> a
+    19:19:void setSkipNameValidationForTesting(boolean):717:717 -> a
+    20:20:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1744:1744 -> a
+    21:21:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> a
+    21:21:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1745 -> a
+    22:23:com.android.tools.r8.graph.DexItem canonicalize(java.util.Map,com.android.tools.r8.graph.DexItem):1745:1746 -> a
+    24:24:com.android.tools.r8.graph.DexString createString(int,byte[]):1752:1752 -> a
+    25:27:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1765:1767 -> a
+    28:28:java.lang.String escapeMemberString(java.lang.String):1761:1761 -> a
+    28:28:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1767 -> a
+    29:36:java.lang.String createMemberString(java.lang.String,com.android.tools.r8.graph.DexType,int):1767:1774 -> a
+    37:40:java.lang.Object createFreshMember(java.util.function.Function,java.lang.String,com.android.tools.r8.graph.DexType):1787:1790 -> a
+    41:41:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1814:1814 -> a
+    41:41:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1827 -> a
+    42:42:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1935:1935 -> a
+    42:42:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1815 -> a
+    42:42:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1827 -> a
+    43:43:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String,com.android.tools.r8.graph.DexType):1817:1817 -> a
+    43:43:com.android.tools.r8.graph.DexString createGloballyFreshMemberString(java.lang.String):1827 -> a
+    44:44:com.android.tools.r8.graph.DexMethod createFreshMethodName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1844:1844 -> a
+    45:49:java.util.Optional lambda$createFreshMethodName$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1846:1850 -> a
+    50:50:com.android.tools.r8.graph.DexMethodSignature createFreshMethodSignatureName(java.lang.String,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.util.function.Predicate):1867:1867 -> a
+    51:55:java.util.Optional lambda$createFreshMethodSignatureName$2(com.android.tools.r8.graph.DexProto,java.util.function.Predicate,com.android.tools.r8.graph.DexString):1869:1873 -> a
+    56:56:com.android.tools.r8.graph.DexField createFreshFieldName(com.android.tools.r8.graph.DexField,java.util.function.Predicate):1886:1886 -> a
+    57:57:com.android.tools.r8.graph.DexField createFreshFieldNameWithHolderSuffix(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1899:1899 -> a
+    58:58:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1912:1912 -> a
+    59:59:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
+    59:59:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1912 -> a
+    60:61:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1912:1913 -> a
+    62:66:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,java.util.function.Function):1922:1926 -> a
+    62:66:com.android.tools.r8.graph.DexMethod createInstanceInitializerWithFreshProto(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1913 -> a
+    67:67:java.util.Optional lambda$createInstanceInitializerWithFreshProto$4(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate,com.android.tools.r8.graph.DexProto):1916:1916 -> a
+    68:68:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):1975:1975 -> a
+    69:71:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1979:1981 -> a
+    69:71:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.Class):1974 -> a
+    72:76:void addPossiblySynthesizedType(com.android.tools.r8.graph.DexType):2000:2004 -> a
+    77:78:com.android.tools.r8.graph.DexType createArrayType(int,com.android.tools.r8.graph.DexType):2030:2031 -> a
+    79:81:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):2035:2037 -> a
+    82:82:com.android.tools.r8.graph.DexField createField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String):2041:2041 -> a
+    83:84:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.graph.DexString):2046:2047 -> a
+    85:88:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2051:2054 -> a
+    89:94:com.android.tools.r8.graph.DexString createShorty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2129:2134 -> a
+    89:94:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2055 -> a
+    95:95:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType[]):2052:2052 -> a
+    96:96:com.android.tools.r8.graph.DexProto createProto(com.android.tools.r8.graph.DexType,java.util.List):2059:2059 -> a
+    97:100:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2073:2076 -> a
+    101:103:com.android.tools.r8.graph.DexProto prependTypeToProto(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto):2075:2077 -> a
+    104:106:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2081:2083 -> a
+    107:110:com.android.tools.r8.graph.DexProto appendTypeToProto(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2082:2085 -> a
+    111:115:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2095:2099 -> a
+    116:125:com.android.tools.r8.graph.DexType[] applyClassMappingToDexTypes(com.android.tools.r8.graph.DexType[],java.util.function.Function):2116:2125 -> a
+    116:125:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2099 -> a
+    126:132:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2100:2106 -> a
+    133:137:com.android.tools.r8.graph.DexProto applyClassMappingToProto(com.android.tools.r8.graph.DexProto,java.util.function.Function,java.util.Map):2105:2109 -> a
+    138:140:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):2138:2140 -> a
+    141:141:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProto,java.lang.String):2144:2144 -> a
+    142:142:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2152:2152 -> a
+    143:143:void com.android.tools.r8.graph.DexMethodHandle.<init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):209:209 -> a
+    143:143:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2152 -> a
+    144:144:com.android.tools.r8.graph.DexMethodHandle createMethodHandle(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):2153:2153 -> a
+    145:146:com.android.tools.r8.graph.DexCallSite createCallSite(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexMethodHandle,java.util.List):2162:2163 -> a
+    147:156:com.android.tools.r8.graph.DexMethod createMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString[]):2171:2180 -> a
+    157:159:com.android.tools.r8.graph.DexDebugEvent$AdvanceLine createAdvanceLine(int):2188:2190 -> a
+    160:162:com.android.tools.r8.graph.DexDebugEvent$SetFile createSetFile(com.android.tools.r8.graph.DexString):2226:2228 -> a
+    163:165:com.android.tools.r8.graph.DexDebugEvent$SetInlineFrame createSetInlineFrame(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):2233:2235 -> a
+    166:166:boolean isClassConstructor(com.android.tools.r8.graph.DexMethod):2243:2243 -> a
+    167:174:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2276:2283 -> a
+    175:203:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement createReferenceTypeElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.graph.AppView):2282:2310 -> a
+    204:212:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2290:2298 -> a
+    213:224:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement lambda$createReferenceTypeElement$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DexType):2297:2308 -> a
+    225:225:java.util.Set getOrComputeLeastUpperBoundOfImplementedInterfaces(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):2315:2315 -> a
+    226:227:java.util.Set lambda$getOrComputeLeastUpperBoundOfImplementedInterfaces$7(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):2318:2319 -> a
+    228:228:void forAllTypes(java.util.function.Consumer):2325:2325 -> a
+    1:2:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType):595:596 -> b
+    3:6:com.android.tools.r8.graph.DexField internalCreateFreshFieldName(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,java.util.function.Predicate):1904:1904 -> b
+    7:7:com.android.tools.r8.graph.DexString lookupString(int,byte[]):1931:1931 -> b
+    8:8:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1970:1970 -> b
+    9:11:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1979:1981 -> b
+    9:11:com.android.tools.r8.graph.DexType createStaticallyKnownType(java.lang.String):1970 -> b
+    12:14:com.android.tools.r8.graph.DexType createStaticallyKnownType(com.android.tools.r8.graph.DexString):1979:1981 -> b
+    15:15:void forEachPossiblyCompilerSynthesizedType(java.util.function.Consumer):2013:2013 -> b
+    16:18:com.android.tools.r8.graph.DexProto protoWithDifferentFirstParameter(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType):2063:2065 -> b
+    19:21:com.android.tools.r8.graph.DexDebugEvent$AdvancePC createAdvancePC(int):2194:2196 -> b
+    22:22:boolean isConstructor(com.android.tools.r8.graph.DexMethod):2239:2239 -> b
+    23:25:void clearTypeElementsCache():2247:2249 -> b
+    1:1:boolean isLambdaMetafactoryMethod(com.android.tools.r8.graph.DexMethod):725:725 -> c
+    2:3:com.android.tools.r8.graph.DexString createString(java.lang.String):1756:1757 -> c
+    4:4:boolean isPossiblyCompilerSynthesizedType(com.android.tools.r8.graph.DexType):2009:2009 -> c
+    5:5:com.android.tools.r8.graph.DexType createType(com.android.tools.r8.graph.DexString):2018:2018 -> c
+    6:8:com.android.tools.r8.graph.DexDebugEvent$Default createDefault(int):2200:2202 -> c
+    9:9:com.android.tools.r8.graph.DexDebugEvent$SetEpilogueBegin createSetEpilogueBegin():2218:2218 -> c
+    1:9:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1954:1962 -> d
+    10:10:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1959:1959 -> d
+    11:11:boolean isInternalSentinel(com.android.tools.r8.graph.DexItem):112:112 -> d
+    11:11:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1963 -> d
+    12:13:com.android.tools.r8.graph.DexType internalCreateType(com.android.tools.r8.graph.DexString):1963:1964 -> d
+    14:15:com.android.tools.r8.graph.DexType createSynthesizedType(java.lang.String):1988:1989 -> d
+    16:16:void registerTypeNeededForDesugaring(com.android.tools.r8.graph.DexType):1996:1996 -> d
+    17:17:com.android.tools.r8.graph.DexProto prependHolderToProto(com.android.tools.r8.graph.DexMethod):2069:2069 -> d
+    18:20:com.android.tools.r8.graph.DexDebugEvent$EndLocal createEndLocal(int):2206:2208 -> d
+    21:21:com.android.tools.r8.graph.DexDebugEvent$SetPrologueEnd createSetPrologueEnd():2222:2222 -> d
+    1:5:java.util.List extractMarkers():1942:1946 -> e
+    6:6:com.android.tools.r8.graph.DexType createType(java.lang.String):2022:2022 -> e
+    7:7:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexString):2026:2026 -> e
+    8:10:com.android.tools.r8.graph.DexDebugEvent$RestartLocal createRestartLocal(int):2212:2214 -> e
+    1:1:boolean getSkipNameValidationForTesting():721:721 -> f
+    2:2:com.android.tools.r8.graph.DexString lookupString(java.lang.String):1935:1935 -> f
+    1:3:boolean verifyNoCachedTypeElements():2253:2255 -> g
 com.android.tools.r8.graph.DexItemFactory$1 -> com.android.tools.r8.graph.L$a:
 com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildMembers -> com.android.tools.r8.graph.L$b:
     com.android.tools.r8.graph.DexField TYPE -> q
@@ -18801,8 +18845,8 @@
     com.android.tools.r8.graph.DexField BOOTLOADER -> a
     com.android.tools.r8.graph.DexField CPU_ABI2 -> d
     com.android.tools.r8.graph.DexField CPU_ABI -> c
-    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):753:775 -> <init>
-    1:17:void forEachFinalField(java.util.function.Consumer):779:795 -> a
+    1:23:void <init>(com.android.tools.r8.graph.DexItemFactory):756:778 -> <init>
+    1:17:void forEachFinalField(java.util.function.Consumer):782:798 -> a
 com.android.tools.r8.graph.DexItemFactory$AndroidOsBuildVersionMembers -> com.android.tools.r8.graph.L$c:
     com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField SECURITY_PATCH -> e
@@ -18810,20 +18854,20 @@
     com.android.tools.r8.graph.DexField CODENAME -> a
     com.android.tools.r8.graph.DexField SDK_INT -> d
     com.android.tools.r8.graph.DexField SDK -> c
-    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):799:806 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):810:814 -> a
+    1:8:void <init>(com.android.tools.r8.graph.DexItemFactory):802:809 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):813:817 -> a
 com.android.tools.r8.graph.DexItemFactory$AndroidOsBundleMembers -> com.android.tools.r8.graph.L$d:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField EMPTY -> b
     com.android.tools.r8.graph.DexField CREATOR -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):818:822 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):826:827 -> a
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):821:825 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):829:830 -> a
 com.android.tools.r8.graph.DexItemFactory$AndroidSystemOsConstantsMembers -> com.android.tools.r8.graph.L$e:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField S_IXUSR -> b
     com.android.tools.r8.graph.DexField S_IRUSR -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):831:834 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):838:839 -> a
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):834:837 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):841:842 -> a
 com.android.tools.r8.graph.DexItemFactory$AndroidViewViewMembers -> com.android.tools.r8.graph.L$f:
     com.android.tools.r8.graph.DexItemFactory this$0 -> f
     com.android.tools.r8.graph.DexField SELECTED_STATE_SET -> e
@@ -18831,21 +18875,21 @@
     com.android.tools.r8.graph.DexField TRANSLATION_Z -> a
     com.android.tools.r8.graph.DexField PRESSED_ENABLED_STATE_SET -> d
     com.android.tools.r8.graph.DexField ENABLED_STATE_SET -> c
-    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):843:854 -> <init>
-    1:5:void forEachFinalField(java.util.function.Consumer):858:862 -> a
+    1:12:void <init>(com.android.tools.r8.graph.DexItemFactory):846:857 -> <init>
+    1:5:void forEachFinalField(java.util.function.Consumer):861:865 -> a
 com.android.tools.r8.graph.DexItemFactory$AssertionErrorMethods -> com.android.tools.r8.graph.L$g:
     com.android.tools.r8.graph.DexMethod initMessageAndCause -> b
     com.android.tools.r8.graph.DexMethod initMessage -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1078:1078 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1082:1087 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1081:1081 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1085:1090 -> <init>
 com.android.tools.r8.graph.DexItemFactory$AtomicFieldUpdaterMethods -> com.android.tools.r8.graph.L$h:
     java.util.Set updaters -> d
     com.android.tools.r8.graph.DexMethod referenceUpdater -> c
     com.android.tools.r8.graph.DexMethod longUpdater -> b
     com.android.tools.r8.graph.DexMethod intUpdater -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1397:1397 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1403:1422 -> <init>
-    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1426:1426 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1407:1407 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1413:1432 -> <init>
+    1:1:boolean isFieldUpdater(com.android.tools.r8.graph.DexMethod):1436:1436 -> a
 com.android.tools.r8.graph.DexItemFactory$BooleanMembers -> com.android.tools.r8.graph.L$i:
     com.android.tools.r8.graph.DexItemFactory this$0 -> g
     com.android.tools.r8.graph.DexField TRUE -> b
@@ -18854,39 +18898,44 @@
     com.android.tools.r8.graph.DexMethod parseBoolean -> e
     com.android.tools.r8.graph.DexField TYPE -> c
     com.android.tools.r8.graph.DexMethod booleanValue -> d
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):730:730 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):743:743 -> <init>
-    3:12:void <init>(com.android.tools.r8.graph.DexItemFactory):732:741 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):747:749 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):733:733 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):746:746 -> <init>
+    3:12:void <init>(com.android.tools.r8.graph.DexItemFactory):735:744 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):750:752 -> a
 com.android.tools.r8.graph.DexItemFactory$ClassMethods -> com.android.tools.r8.graph.L$j:
-    com.android.tools.r8.graph.DexMethod newInstance -> m
-    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> l
-    com.android.tools.r8.graph.DexMethod getMethod -> k
-    com.android.tools.r8.graph.DexMethod getDeclaredField -> j
-    com.android.tools.r8.graph.DexMethod getField -> i
-    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> h
-    com.android.tools.r8.graph.DexMethod getTypeName -> g
-    com.android.tools.r8.graph.DexMethod getSimpleName -> f
-    com.android.tools.r8.graph.DexMethod getCanonicalName -> e
-    com.android.tools.r8.graph.DexMethod getName -> d
+    com.android.tools.r8.graph.DexMethod getPackage -> o
+    com.android.tools.r8.graph.DexMethod getDeclaredMethod -> n
+    com.android.tools.r8.graph.DexMethod getMethod -> m
+    com.android.tools.r8.graph.DexMethod getDeclaredField -> l
+    com.android.tools.r8.graph.DexMethod getField -> k
+    com.android.tools.r8.graph.DexMethod getDeclaredConstructor -> j
+    com.android.tools.r8.graph.DexMethod getConstructor -> i
+    com.android.tools.r8.graph.DexMethod getTypeName -> h
+    com.android.tools.r8.graph.DexMethod getSimpleName -> g
+    com.android.tools.r8.graph.DexMethod getCanonicalName -> f
+    com.android.tools.r8.graph.DexMethod getName -> e
+    com.android.tools.r8.graph.DexMethod getClassLoader -> d
     com.android.tools.r8.graph.DexMethod forName3 -> c
     com.android.tools.r8.graph.DexMethod forName -> b
     com.android.tools.r8.graph.DexMethod desiredAssertionStatus -> a
-    java.util.Set getNames -> o
-    java.util.Set getMembers -> n
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1158:1158 -> <init>
-    2:41:void <init>(com.android.tools.r8.graph.DexItemFactory):1176:1215 -> <init>
-    1:1:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1219:1219 -> a
-    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1223:1223 -> b
+    com.android.tools.r8.graph.DexItemFactory this$0 -> s
+    java.util.Set getMembers -> q
+    java.util.Set getNames -> r
+    com.android.tools.r8.graph.DexMethod newInstance -> p
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1161:1161 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1184:1184 -> <init>
+    3:62:void <init>(com.android.tools.r8.graph.DexItemFactory):1166:1225 -> <init>
+    1:1:boolean isReflectiveClassLookup(com.android.tools.r8.graph.DexMethod):1229:1229 -> a
+    1:1:boolean isReflectiveMemberLookup(com.android.tools.r8.graph.DexMethod):1233:1233 -> b
 com.android.tools.r8.graph.DexItemFactory$ConstructorMethods -> com.android.tools.r8.graph.L$k:
     com.android.tools.r8.graph.DexMethod newInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1231:1231 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1235:1237 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1241:1241 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1245:1247 -> <init>
 com.android.tools.r8.graph.DexItemFactory$DoubleMethods -> com.android.tools.r8.graph.L$l:
     com.android.tools.r8.graph.DexMethod isNaN -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1031:1031 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1035:1039 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1037:1037 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1034:1034 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1038:1042 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1040:1040 -> <init>
 com.android.tools.r8.graph.DexItemFactory$EnumMembers -> com.android.tools.r8.graph.L$m:
     com.android.tools.r8.graph.DexMethod finalize -> l
     com.android.tools.r8.graph.DexMethod constructor -> k
@@ -18901,61 +18950,61 @@
     com.android.tools.r8.graph.DexField ordinalField -> c
     com.android.tools.r8.graph.DexItemFactory this$0 -> m
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1258:1258 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1258:1258 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1276:1276 -> <init>
-    3:46:void <init>(com.android.tools.r8.graph.DexItemFactory):1260:1303 -> <init>
-    1:4:boolean isValuesMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1316:1319 -> a
+    1:1:void <clinit>():1268:1268 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1268:1268 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1286:1286 -> <init>
+    3:46:void <init>(com.android.tools.r8.graph.DexItemFactory):1270:1313 -> <init>
+    1:4:boolean isValuesMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass):1326:1329 -> a
 com.android.tools.r8.graph.DexItemFactory$FloatMembers -> com.android.tools.r8.graph.L$n:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexField TYPE -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):866:866 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):870:870 -> <init>
-    3:3:void <init>(com.android.tools.r8.graph.DexItemFactory):868:868 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):874:874 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):869:869 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):873:873 -> <init>
+    3:3:void <init>(com.android.tools.r8.graph.DexItemFactory):871:871 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):877:877 -> a
 com.android.tools.r8.graph.DexItemFactory$IllegalArgumentExceptionMethods -> com.android.tools.r8.graph.L$o:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexMethod initWithMessage -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1341:1345 -> <init>
-    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1344:1344 -> <init>
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):1351:1355 -> <init>
+    6:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1354:1354 -> <init>
 com.android.tools.r8.graph.DexItemFactory$IntegerMembers -> com.android.tools.r8.graph.L$p:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexField TYPE -> a
-    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):1045:1047 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1051:1051 -> a
+    1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):1048:1050 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1054:1054 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaIoFileMembers -> com.android.tools.r8.graph.L$q:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField separator -> b
     com.android.tools.r8.graph.DexField pathSeparator -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):878:881 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):885:886 -> a
+    1:4:void <init>(com.android.tools.r8.graph.DexItemFactory):881:884 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):888:889 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaLangSystemMethods -> com.android.tools.r8.graph.L$r:
     com.android.tools.r8.graph.DexMethod identityHashCode -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1245:1245 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1248:1250 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1255:1255 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1258:1260 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaMathBigIntegerMembers -> com.android.tools.r8.graph.L$s:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField ZERO -> b
     com.android.tools.r8.graph.DexField ONE -> a
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):890:894 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):898:899 -> a
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):893:897 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):901:902 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaNioByteOrderMembers -> com.android.tools.r8.graph.L$t:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField BIG_ENDIAN -> b
     com.android.tools.r8.graph.DexField LITTLE_ENDIAN -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):903:908 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):912:913 -> a
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):906:911 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):915:916 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaUtilArraysMethods -> com.android.tools.r8.graph.L$u:
     com.android.tools.r8.graph.DexMethod asList -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):917:917 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):921:925 -> <init>
-    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):923:923 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):920:920 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory):924:928 -> <init>
+    7:7:void <init>(com.android.tools.r8.graph.DexItemFactory):926:926 -> <init>
 com.android.tools.r8.graph.DexItemFactory$JavaUtilComparatorMembers -> com.android.tools.r8.graph.L$v:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexField EMPTY_SET -> b
     com.android.tools.r8.graph.DexField EMPTY_LIST -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):931:936 -> <init>
-    1:2:void forEachFinalField(java.util.function.Consumer):940:941 -> a
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):934:939 -> <init>
+    1:2:void forEachFinalField(java.util.function.Consumer):943:944 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaUtilConcurrentTimeUnitMembers -> com.android.tools.r8.graph.L$w:
     com.android.tools.r8.graph.DexField NANOSECONDS -> f
     com.android.tools.r8.graph.DexField MINUTES -> e
@@ -18965,15 +19014,15 @@
     com.android.tools.r8.graph.DexField DAYS -> a
     com.android.tools.r8.graph.DexField MILLISECONDS -> d
     com.android.tools.r8.graph.DexField MICROSECONDS -> c
-    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):945:960 -> <init>
-    1:7:void forEachFinalField(java.util.function.Consumer):964:970 -> a
+    1:16:void <init>(com.android.tools.r8.graph.DexItemFactory):948:963 -> <init>
+    1:7:void forEachFinalField(java.util.function.Consumer):967:973 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaUtilLocaleMembers -> com.android.tools.r8.graph.L$x:
     com.android.tools.r8.graph.DexItemFactory this$0 -> d
     com.android.tools.r8.graph.DexField ROOT -> b
     com.android.tools.r8.graph.DexField ENGLISH -> a
     com.android.tools.r8.graph.DexField US -> c
-    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):974:978 -> <init>
-    1:3:void forEachFinalField(java.util.function.Consumer):982:984 -> a
+    1:5:void <init>(com.android.tools.r8.graph.DexItemFactory):977:981 -> <init>
+    1:3:void forEachFinalField(java.util.function.Consumer):985:987 -> a
 com.android.tools.r8.graph.DexItemFactory$JavaUtilLoggingLevelMembers -> com.android.tools.r8.graph.L$y:
     com.android.tools.r8.graph.DexField WARNING -> f
     com.android.tools.r8.graph.DexField SEVERE -> e
@@ -18982,23 +19031,23 @@
     com.android.tools.r8.graph.DexField CONFIG -> a
     com.android.tools.r8.graph.DexField FINEST -> d
     com.android.tools.r8.graph.DexField FINER -> c
-    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):988:1001 -> <init>
-    1:6:void forEachFinalField(java.util.function.Consumer):1005:1010 -> a
+    1:14:void <init>(com.android.tools.r8.graph.DexItemFactory):991:1004 -> <init>
+    1:6:void forEachFinalField(java.util.function.Consumer):1008:1013 -> a
 com.android.tools.r8.graph.DexItemFactory$LibraryMembers -> com.android.tools.r8.graph.L$z:
     void forEachFinalField(java.util.function.Consumer) -> a
 com.android.tools.r8.graph.DexItemFactory$LongMembers -> com.android.tools.r8.graph.L$A:
     com.android.tools.r8.graph.DexItemFactory this$0 -> b
     com.android.tools.r8.graph.DexField TYPE -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1014:1014 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1020:1020 -> <init>
-    3:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1016:1022 -> <init>
-    10:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1021:1021 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1027:1027 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1017:1017 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1023:1023 -> <init>
+    3:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1019:1025 -> <init>
+    10:10:void <init>(com.android.tools.r8.graph.DexItemFactory):1024:1024 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1030:1030 -> a
 com.android.tools.r8.graph.DexItemFactory$NullPointerExceptionMethods -> com.android.tools.r8.graph.L$B:
     com.android.tools.r8.graph.DexItemFactory this$0 -> c
     com.android.tools.r8.graph.DexMethod initWithMessage -> b
     com.android.tools.r8.graph.DexMethod init -> a
-    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1333:1338 -> <init>
+    1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):1343:1348 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectMembers -> com.android.tools.r8.graph.L$C:
     com.android.tools.r8.graph.DexMethod toString -> h
     com.android.tools.r8.graph.DexItemFactory this$0 -> i
@@ -19009,18 +19058,18 @@
     com.android.tools.r8.graph.DexMethod getClass -> d
     com.android.tools.r8.graph.DexMethod equals -> c
     com.android.tools.r8.graph.DexMethod clone -> b
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1092:1092 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1110:1110 -> <init>
-    3:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1099:1119 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1095:1095 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1113:1113 -> <init>
+    3:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1102:1122 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ObjectsMethods -> com.android.tools.r8.graph.L$D:
     com.android.tools.r8.graph.DexMethod requireNonNullWithMessageSupplier -> c
     com.android.tools.r8.graph.DexMethod requireNonNullWithMessage -> b
     com.android.tools.r8.graph.DexMethod requireNonNull -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1124:1124 -> <init>
-    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1130:1137 -> <init>
-    10:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1135:1142 -> <init>
-    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1140:1140 -> <init>
-    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1147:1147 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1127:1127 -> <init>
+    2:9:void <init>(com.android.tools.r8.graph.DexItemFactory):1133:1140 -> <init>
+    10:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1138:1145 -> <init>
+    18:18:void <init>(com.android.tools.r8.graph.DexItemFactory):1143:1143 -> <init>
+    1:1:boolean isRequireNonNullMethod(com.android.tools.r8.graph.DexMethod):1150:1150 -> a
 com.android.tools.r8.graph.DexItemFactory$PolymorphicMethods -> com.android.tools.r8.graph.L$E:
     com.android.tools.r8.graph.DexProto compareAndSetSignature -> c
     java.util.Set varHandleMethods -> d
@@ -19029,9 +19078,9 @@
     java.util.Set varHandleCompareAndSetMethods -> f
     com.android.tools.r8.graph.DexProto signature -> a
     com.android.tools.r8.graph.DexProto setSignature -> b
-    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1622:1657 -> <init>
-    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1665:1675 -> a
-    12:17:java.util.Set createStrings(java.lang.String[]):1682:1687 -> a
+    1:36:void <init>(com.android.tools.r8.graph.DexItemFactory):1632:1667 -> <init>
+    1:11:com.android.tools.r8.graph.DexMethod canonicalize(com.android.tools.r8.graph.DexMethod):1675:1685 -> a
+    12:17:java.util.Set createStrings(java.lang.String[]):1692:1697 -> a
 com.android.tools.r8.graph.DexItemFactory$PrimitiveTypesBoxedTypeFields -> com.android.tools.r8.graph.L$F:
     com.android.tools.r8.graph.DexField floatTYPE -> f
     com.android.tools.r8.graph.DexField longTYPE -> e
@@ -19041,24 +19090,24 @@
     com.android.tools.r8.graph.DexField intTYPE -> d
     com.android.tools.r8.graph.DexField shortTYPE -> c
     java.util.Map boxedFieldTypeToPrimitiveType -> h
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1354:1354 -> <init>
-    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1366:1385 -> <init>
-    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1389:1389 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1364:1364 -> <init>
+    2:21:void <init>(com.android.tools.r8.graph.DexItemFactory):1376:1395 -> <init>
+    1:1:com.android.tools.r8.graph.DexType boxedFieldTypeToPrimitiveType(com.android.tools.r8.graph.DexField):1399:1399 -> a
 com.android.tools.r8.graph.DexItemFactory$ProxyMethods -> com.android.tools.r8.graph.L$G:
     com.android.tools.r8.graph.DexMethod newProxyInstance -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1691:1691 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1695:1700 -> <init>
-    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1697:1697 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1701:1701 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.DexItemFactory):1705:1710 -> <init>
+    8:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1707:1707 -> <init>
 com.android.tools.r8.graph.DexItemFactory$ServiceLoaderMethods -> com.android.tools.r8.graph.L$H:
     com.android.tools.r8.graph.DexMethod iterator -> d
     com.android.tools.r8.graph.DexMethod loadInstalled -> c
     com.android.tools.r8.graph.DexMethod loadWithClassLoader -> b
     com.android.tools.r8.graph.DexMethod load -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1704:1704 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1711:1717 -> <init>
-    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1715:1723 -> <init>
-    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1720:1725 -> <init>
-    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1729:1729 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1714:1714 -> <init>
+    2:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1721:1727 -> <init>
+    9:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1725:1733 -> <init>
+    18:23:void <init>(com.android.tools.r8.graph.DexItemFactory):1730:1735 -> <init>
+    1:1:boolean isLoadMethod(com.android.tools.r8.graph.DexMethod):1739:1739 -> a
 com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods -> com.android.tools.r8.graph.L$I:
     com.android.tools.r8.graph.DexMethod charSequenceConstructor -> o
     com.android.tools.r8.graph.DexMethod appendStringBuffer -> n
@@ -19081,12 +19130,12 @@
     com.android.tools.r8.graph.DexMethod stringConstructor -> r
     com.android.tools.r8.graph.DexMethod intConstructor -> q
     com.android.tools.r8.graph.DexMethod defaultConstructor -> p
-    1:1:void <clinit>():1514:1514 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1514:1514 -> <init>
-    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1536:1580 -> <init>
-    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1514:1514 -> a
-    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1587:1587 -> a
-    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1591:1617 -> a
+    1:1:void <clinit>():1524:1524 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory$1):1524:1524 -> <init>
+    2:46:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):1546:1590 -> <init>
+    1:1:java.util.Set access$1900(com.android.tools.r8.graph.DexItemFactory$StringBuildingMethods):1524:1524 -> a
+    2:2:boolean isAppendMethod(com.android.tools.r8.graph.DexMethod):1597:1597 -> a
+    3:29:boolean constructorInvokeIsSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod):1601:1627 -> a
 com.android.tools.r8.graph.DexItemFactory$StringMembers -> com.android.tools.r8.graph.L$J:
     com.android.tools.r8.graph.DexMethod compareTo -> o
     com.android.tools.r8.graph.DexMethod lastIndexOfString -> n
@@ -19110,20 +19159,20 @@
     com.android.tools.r8.graph.DexMethod valueOf -> r
     com.android.tools.r8.graph.DexMethod hashCode -> q
     com.android.tools.r8.graph.DexMethod compareToIgnoreCase -> p
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1430:1430 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1460:1460 -> <init>
-    3:75:void <init>(com.android.tools.r8.graph.DexItemFactory):1432:1504 -> <init>
-    1:1:void forEachFinalField(java.util.function.Consumer):1510:1510 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1440:1440 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.DexItemFactory):1470:1470 -> <init>
+    3:75:void <init>(com.android.tools.r8.graph.DexItemFactory):1442:1514 -> <init>
+    1:1:void forEachFinalField(java.util.function.Consumer):1520:1520 -> a
 com.android.tools.r8.graph.DexItemFactory$ThrowableMethods -> com.android.tools.r8.graph.L$K:
     com.android.tools.r8.graph.DexMethod initCause -> d
     com.android.tools.r8.graph.DexMethod getSuppressed -> c
     com.android.tools.r8.graph.DexMethod getMessage -> b
     com.android.tools.r8.graph.DexMethod addSuppressed -> a
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1055:1055 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1062:1064 -> <init>
-    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1063:1066 -> <init>
-    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1065:1072 -> <init>
-    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1070:1070 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexItemFactory$1):1058:1058 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.DexItemFactory):1065:1067 -> <init>
+    5:8:void <init>(com.android.tools.r8.graph.DexItemFactory):1066:1069 -> <init>
+    9:16:void <init>(com.android.tools.r8.graph.DexItemFactory):1068:1075 -> <init>
+    17:17:void <init>(com.android.tools.r8.graph.DexItemFactory):1073:1073 -> <init>
 com.android.tools.r8.graph.DexLibraryClass -> com.android.tools.r8.graph.M:
     int $r8$clinit -> t
     boolean $assertionsDisabled -> s
@@ -19133,10 +19182,10 @@
     1:3:boolean verifyLibraryMethod(com.android.tools.r8.graph.DexEncodedMethod):73:75 -> a
     1:1:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):98:98 -> b
     1:1:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):80:80 -> e
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> e
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():180:180 -> e
     2:2:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):80 -> e
     3:3:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):80:80 -> e
-    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> e
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> e
     4:4:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):81 -> e
     5:5:boolean verifyLibraryField(com.android.tools.r8.graph.DexEncodedField):81:81 -> e
     1:1:java.lang.String toSourceString():92:92 -> m
@@ -19150,8 +19199,9 @@
     1:5:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):14:18 -> <init>
     com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass) -> a
     com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass) -> a
-    1:1:java.lang.Iterable getReferencedBaseTypes(com.android.tools.r8.graph.DexItemFactory):42:42 -> a
-    2:2:com.android.tools.r8.graph.DexType lambda$getReferencedBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):42:42 -> a
+    1:1:java.lang.Iterable getReferencedBaseTypes(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
+    2:2:com.android.tools.r8.graph.DexType lambda$getReferencedBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):47:47 -> a
+    1:1:com.android.tools.r8.graph.DexType getContextType():31:31 -> k
     com.android.tools.r8.graph.DexMember asDexMember() -> r
     boolean isDexMember() -> v
     java.lang.Iterable getReferencedTypes() -> y
@@ -19174,8 +19224,11 @@
     1:1:int getArity():110:110 -> A
     1:1:com.android.tools.r8.graph.DexString getName():37:37 -> B
     1:1:com.android.tools.r8.graph.DexType getReturnType():49:49 -> C
-    1:1:java.lang.String qualifiedName():216:216 -> D
-    1:1:java.lang.String toSourceStringWithoutHolder():230:230 -> E
+    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():114:114 -> D
+    2:2:void com.android.tools.r8.graph.DexMethodSignature.<init>(com.android.tools.r8.graph.DexMethod):14:14 -> D
+    2:2:com.android.tools.r8.graph.DexMethodSignature getSignature():114 -> D
+    1:1:java.lang.String qualifiedName():220:220 -> E
+    1:1:java.lang.String toSourceStringWithoutHolder():234:234 -> F
     1:1:com.android.tools.r8.graph.DexEncodedMember lookupOnClass(com.android.tools.r8.graph.DexClass):18:18 -> a
     2:2:com.android.tools.r8.graph.ProgramMember lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):18:18 -> a
     3:3:int slowCompareTo(java.lang.Object):18:18 -> a
@@ -19183,44 +19236,44 @@
     5:5:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):57:57 -> a
     6:6:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):65:65 -> a
     7:7:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):74:74 -> a
-    8:10:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):121:123 -> a
-    8:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):115 -> a
-    11:11:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):130:130 -> a
-    11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):116 -> a
+    8:10:boolean collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):125:127 -> a
+    8:10:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):119 -> a
+    11:11:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):134:134 -> a
+    11:11:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120 -> a
     12:255:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:243 -> a
-    12:255:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):130 -> a
-    12:255:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):116 -> a
-    256:256:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):135:135 -> a
-    257:265:int slowCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):194:202 -> a
-    266:266:boolean match(com.android.tools.r8.graph.DexMethod):207:207 -> a
-    267:281:java.lang.String toSourceString(boolean,boolean):238:252 -> a
-    282:282:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):270:270 -> a
+    12:255:void collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):134 -> a
+    12:255:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):120 -> a
+    256:256:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):139:139 -> a
+    257:265:int slowCompareTo(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.naming.NamingLens):198:206 -> a
+    266:266:boolean match(com.android.tools.r8.graph.DexMethod):211:211 -> a
+    267:281:java.lang.String toSourceString(boolean,boolean):242:256 -> a
+    282:282:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod lookupOnClass(com.android.tools.r8.graph.DexClass):79:79 -> b
     2:2:com.android.tools.r8.graph.ProgramMethod lookupOnProgramClass(com.android.tools.r8.graph.DexProgramClass):84:84 -> b
-    3:11:int slowCompareTo(com.android.tools.r8.graph.DexMethod):181:189 -> b
-    1:5:boolean computeEquals(java.lang.Object):162:166 -> c
+    3:11:int slowCompareTo(com.android.tools.r8.graph.DexMethod):185:193 -> b
+    1:5:boolean computeEquals(java.lang.Object):166:170 -> c
     1:1:com.android.tools.r8.graph.DexType getHolderType():33:33 -> d
     1:1:com.android.tools.r8.graph.DexType getParameter(int):41:41 -> g
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProto.getParameter(int):45:45 -> g
     2:2:com.android.tools.r8.graph.DexType getParameter(int):41 -> g
-    1:1:java.lang.String toSmaliString():221:221 -> l
+    1:1:java.lang.String toSmaliString():225:225 -> l
     2:2:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():0:0 -> l
-    2:2:java.lang.String toSmaliString():221 -> l
-    3:3:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():108:108 -> l
-    3:3:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():104 -> l
-    3:3:java.lang.String toSmaliString():221 -> l
-    4:4:java.lang.String toSmaliString():221:221 -> l
-    1:1:java.lang.String toSourceString():226:226 -> m
-    1:3:int computeHashCode():155:157 -> p
+    2:2:java.lang.String toSmaliString():225 -> l
+    3:3:java.lang.String com.android.tools.r8.graph.DexProto.toDescriptorString():112:112 -> l
+    3:3:java.lang.String com.android.tools.r8.graph.DexProto.toSmaliString():108 -> l
+    3:3:java.lang.String toSmaliString():225 -> l
+    4:4:java.lang.String toSmaliString():225:225 -> l
+    1:1:java.lang.String toSourceString():230:230 -> m
+    1:3:int computeHashCode():159:161 -> p
     com.android.tools.r8.graph.DexMethod asDexMethod() -> s
     1:1:java.lang.String toString():89:89 -> toString
     boolean isDexMethod() -> w
-    1:1:java.lang.Iterable getReferencedTypes():150:150 -> y
+    1:1:java.lang.Iterable getReferencedTypes():154:154 -> y
     2:2:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():36:36 -> y
-    2:2:java.lang.Iterable getReferencedTypes():150 -> y
+    2:2:java.lang.Iterable getReferencedTypes():154 -> y
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> y
     3:3:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():36 -> y
-    3:3:java.lang.Iterable getReferencedTypes():150 -> y
+    3:3:java.lang.Iterable getReferencedTypes():154 -> y
     1:12:com.android.tools.r8.references.MethodReference asMethodReference():93:104 -> z
     13:13:com.android.tools.r8.references.MethodReference asMethodReference():102:102 -> z
 com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.Q:
@@ -19271,32 +19324,32 @@
     153:154:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.naming.NamingLens):336:337 -> a
     153:154:int slowCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):15 -> a
     155:161:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):262:268 -> a
-    162:285:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):0:123 -> a
-    162:285:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):272 -> a
-    286:286:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
-    287:417:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):0:130 -> a
-    287:417:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273 -> a
-    418:661:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:243 -> a
-    418:661:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):130 -> a
-    418:661:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273 -> a
-    662:662:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):276:276 -> a
-    663:663:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):284:284 -> a
-    664:664:boolean isMethodHandle():298:298 -> a
-    664:664:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):348 -> a
-    665:679:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):349:363 -> a
-    680:680:boolean isFieldHandle():294:294 -> a
-    680:680:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):363 -> a
-    681:688:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):363:370 -> a
-    689:710:int getAsmTag():374:395 -> a
-    689:710:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):370 -> a
-    711:711:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):370:370 -> a
-    712:712:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):317:317 -> a
-    713:713:boolean isFieldHandle():294:294 -> a
-    713:713:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):319 -> a
-    714:716:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):320:322 -> a
-    717:717:boolean isMethodHandle():298:298 -> a
-    717:717:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):322 -> a
-    718:719:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):322:323 -> a
+    162:289:boolean com.android.tools.r8.graph.DexMethod.collectIndexedItemsExceptName(com.android.tools.r8.dex.IndexedItemCollection):0:127 -> a
+    162:289:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):272 -> a
+    290:290:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273:273 -> a
+    291:425:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):0:134 -> a
+    291:425:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273 -> a
+    426:669:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:243 -> a
+    426:669:void com.android.tools.r8.graph.DexMethod.collectIndexedItemsName(com.android.tools.r8.dex.IndexedItemCollection):134 -> a
+    426:669:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):273 -> a
+    670:670:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):276:276 -> a
+    671:671:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):284:284 -> a
+    672:672:boolean isMethodHandle():298:298 -> a
+    672:672:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):348 -> a
+    673:687:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):349:363 -> a
+    688:688:boolean isFieldHandle():294:294 -> a
+    688:688:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):363 -> a
+    689:696:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):363:370 -> a
+    697:718:int getAsmTag():374:395 -> a
+    697:718:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):370 -> a
+    719:719:com.android.tools.r8.org.objectweb.asm.Handle toAsmHandle(com.android.tools.r8.naming.NamingLens):370:370 -> a
+    720:720:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):317:317 -> a
+    721:721:boolean isFieldHandle():294:294 -> a
+    721:721:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):319 -> a
+    722:724:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):320:322 -> a
+    725:725:boolean isMethodHandle():298:298 -> a
+    725:725:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):322 -> a
+    726:727:int slowCompareTo(com.android.tools.r8.graph.DexMethodHandle):322:323 -> a
     1:6:boolean computeEquals(java.lang.Object):240:245 -> c
     1:1:java.lang.String toSmaliString():290:290 -> l
     1:1:int computeHashCode():235:235 -> p
@@ -19371,6 +19424,27 @@
     20:20:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():173:173 -> i
     21:21:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():171:171 -> i
     22:22:com.android.tools.r8.ir.code.Invoke$Type toInvokeType():169:169 -> i
+com.android.tools.r8.graph.DexMethodSignature -> com.android.tools.r8.internal.P8:
+    com.android.tools.r8.graph.DexString name -> c
+    com.android.tools.r8.graph.DexProto proto -> b
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():9:9 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexString):17:21 -> <init>
+    1:1:com.android.tools.r8.graph.DexProto getProto():25:25 -> a
+    2:2:com.android.tools.r8.graph.DexMethodSignature withName(com.android.tools.r8.graph.DexString):33:33 -> a
+    3:3:com.android.tools.r8.graph.DexMethodSignature withProto(com.android.tools.r8.graph.DexProto):37:37 -> a
+    4:4:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):41:41 -> a
+    5:5:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():561:561 -> a
+    5:5:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):41 -> a
+    6:6:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.getContextType():0:0 -> a
+    6:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):45 -> a
+    6:6:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):41 -> a
+    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethodSignature.withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):45:45 -> a
+    7:7:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory):41 -> a
+    8:8:com.android.tools.r8.graph.DexMethod withHolder(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexItemFactory):45:45 -> a
+    1:3:boolean equals(java.lang.Object):51:53 -> equals
+    1:1:int hashCode():58:58 -> hashCode
+    1:1:java.lang.String toString():71:71 -> toString
 com.android.tools.r8.graph.DexProgramClass -> com.android.tools.r8.graph.S:
     java.util.Collection synthesizedFrom -> v
     com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier checksumSupplier -> z
@@ -19416,55 +19490,45 @@
     1:1:java.lang.Iterable programInstanceInitializers():171:171 -> N0
     1:1:void setDeprecated():585:585 -> O0
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> a
-    1:778:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:777 -> a
-    1:778:void lambda$addDependencies$11(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):335 -> a
-    779:781:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):17:19 -> a
-    779:781:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
-    782:782:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    782:782:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20 -> a
-    782:782:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
-    783:784:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20:21 -> a
-    783:784:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
-    785:794:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:52 -> a
-    785:794:void lambda$collectIndexedItems$10(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):309 -> a
-    795:795:void lambda$forEachProgramField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):149:149 -> a
-    796:796:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):180:180 -> a
-    797:797:void lambda$forEachProgramDirectMethodMatching$4(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):181:181 -> a
-    798:798:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$6(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):250:250 -> a
-    799:799:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250:250 -> a
-    800:805:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):249:254 -> a
-    800:805:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250 -> a
-    806:806:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> a
-    807:808:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):265:266 -> a
-    809:811:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$8(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):268:270 -> a
-    812:819:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):287:294 -> a
-    820:820:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
-    820:820:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):295 -> a
-    821:822:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):297:298 -> a
-    823:824:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):53:54 -> a
-    823:824:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):299 -> a
-    825:833:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):301:309 -> a
-    834:838:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):319:323 -> a
-    839:839:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):386:386 -> a
-    840:842:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):400:402 -> a
-    843:846:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):444:447 -> a
-    847:847:int lambda$computeStaticValuesArray$12(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):457:457 -> a
-    848:850:boolean hasNonDefaultStaticFieldValues():475:477 -> a
-    848:850:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):453 -> a
-    851:865:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):456:470 -> a
-    866:866:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):493:493 -> a
-    867:867:void addExtraInterfaces(java.util.List):516:516 -> a
-    868:871:void addExtraInterfacesToInterfacesArray(java.util.List):524:527 -> a
-    868:871:void addExtraInterfaces(java.util.List):519 -> a
-    872:872:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():413:413 -> a
-    872:872:void addExtraInterfacesToInterfacesArray(java.util.List):527 -> a
-    872:872:void addExtraInterfaces(java.util.List):519 -> a
-    873:875:void addExtraInterfacesToInterfacesArray(java.util.List):527:529 -> a
-    873:875:void addExtraInterfaces(java.util.List):519 -> a
-    876:888:void addExtraInterfacesToSignatureIfPresent(java.util.List):534:546 -> a
-    876:888:void addExtraInterfaces(java.util.List):520 -> a
-    889:891:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):570:572 -> a
-    892:892:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):613:613 -> a
+    1:791:void com.android.tools.r8.graph.DexEncodedMethod.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:790 -> a
+    1:791:void lambda$addDependencies$11(com.android.tools.r8.dex.MixedSectionCollection,com.android.tools.r8.graph.DexEncodedMethod):335 -> a
+    792:794:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):17:19 -> a
+    792:794:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
+    795:795:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
+    795:795:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20 -> a
+    795:795:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
+    796:797:void com.android.tools.r8.graph.ProgramField.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):20:21 -> a
+    796:797:void lambda$collectIndexedItems$9(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.ProgramField):308 -> a
+    798:807:void com.android.tools.r8.graph.ProgramMethod.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):43:52 -> a
+    798:807:void lambda$collectIndexedItems$10(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.graph.ProgramMethod):309 -> a
+    808:808:void lambda$forEachProgramField$0(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedField):149:149 -> a
+    809:809:void forEachProgramDirectMethodMatching(java.util.function.Predicate,java.util.function.Consumer):180:180 -> a
+    810:810:void lambda$forEachProgramDirectMethodMatching$4(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):181:181 -> a
+    811:811:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramFields$6(java.util.function.Function,com.android.tools.r8.graph.DexEncodedField):250:250 -> a
+    812:812:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250:250 -> a
+    813:818:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexClass.traverseFields(java.util.function.Function):259:264 -> a
+    813:818:com.android.tools.r8.utils.TraversalContinuation traverseProgramFields(java.util.function.Function):250 -> a
+    819:819:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$7(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> a
+    820:821:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function,java.util.function.Predicate):265:266 -> a
+    822:824:com.android.tools.r8.utils.TraversalContinuation lambda$traverseProgramMethods$8(java.util.function.Predicate,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):268:270 -> a
+    825:832:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):287:294 -> a
+    833:833:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
+    833:833:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):295 -> a
+    834:835:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):297:298 -> a
+    836:837:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):53:54 -> a
+    836:837:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):299 -> a
+    838:846:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils):301:309 -> a
+    847:851:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):319:323 -> a
+    852:852:com.android.tools.r8.graph.DexProgramClass asProgramClassOrNull(com.android.tools.r8.graph.DexClass):386:386 -> a
+    853:855:void setKotlinInfo(com.android.tools.r8.kotlin.KotlinClassLevelInfo):400:402 -> a
+    856:859:void addSynthesizedFrom(com.android.tools.r8.graph.DexProgramClass):444:447 -> a
+    860:860:int lambda$computeStaticValuesArray$12(com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):457:457 -> a
+    861:863:boolean hasNonDefaultStaticFieldValues():475:477 -> a
+    861:863:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):453 -> a
+    864:878:com.android.tools.r8.graph.DexEncodedArray computeStaticValuesArray(com.android.tools.r8.naming.NamingLens):456:470 -> a
+    879:879:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):493:493 -> a
+    880:882:void setInitialClassFileVersion(com.android.tools.r8.cf.CfVersion):570:572 -> a
+    883:883:java.lang.Iterable asProgramClasses(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):613:613 -> a
     com.android.tools.r8.graph.DexDefinition getDefinition() -> b
     1:1:void forEachProgramMethodMatching(java.util.function.Predicate,java.util.function.Consumer):158:158 -> b
     2:2:void lambda$forEachProgramMethodMatching$1(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):159:159 -> b
@@ -19477,25 +19541,35 @@
     18:78:void com.android.tools.r8.graph.DexTypeList.collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):0:60 -> b
     18:78:void addDependencies(com.android.tools.r8.dex.MixedSectionCollection):341 -> b
     79:79:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):485:485 -> b
-    80:80:void replaceInterfaces(java.util.List):497:497 -> b
-    81:87:void clearInterfaces():505:511 -> b
-    81:87:void replaceInterfaces(java.util.List):500 -> b
-    88:88:void replaceInterfaces(java.util.List):501:501 -> b
-    89:91:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):601:603 -> b
-    92:92:java.util.Iterator lambda$asProgramClasses$13(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):614:614 -> b
-    93:93:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):651:651 -> b
+    80:82:boolean hasReachabilitySensitiveAnnotation(com.android.tools.r8.graph.DexItemFactory):601:603 -> b
+    83:83:java.util.Iterator lambda$asProgramClasses$13(java.lang.Iterable,com.android.tools.r8.graph.DexDefinitionSupplier):614:614 -> b
+    84:84:long checksumFromType(com.android.tools.r8.graph.DexProgramClass):651:651 -> b
     1:1:void forEachProgramVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):190:190 -> c
     2:2:void lambda$forEachProgramVirtualMethodMatching$5(java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):191:191 -> c
     3:3:com.android.tools.r8.utils.TraversalContinuation traverseProgramMethods(java.util.function.Function):255:255 -> c
     4:13:boolean isEffectivelyFinal(com.android.tools.r8.graph.AppView):361:370 -> c
     14:16:boolean hasAnnotations(com.android.tools.r8.graph.DexEncodedField[]):432:434 -> c
     17:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):489:489 -> c
-    18:18:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):646:646 -> c
-    19:19:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> c
-    19:19:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):646 -> c
-    20:20:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):646:646 -> c
+    18:18:void addExtraInterfaces(java.util.List):516:516 -> c
+    19:22:void addExtraInterfacesToInterfacesArray(java.util.List):524:527 -> c
+    19:22:void addExtraInterfaces(java.util.List):519 -> c
+    23:23:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GenericSignature$ClassTypeSignature.type():413:413 -> c
+    23:23:void addExtraInterfacesToInterfacesArray(java.util.List):527 -> c
+    23:23:void addExtraInterfaces(java.util.List):519 -> c
+    24:26:void addExtraInterfacesToInterfacesArray(java.util.List):527:529 -> c
+    24:26:void addExtraInterfaces(java.util.List):519 -> c
+    27:39:void addExtraInterfacesToSignatureIfPresent(java.util.List):534:546 -> c
+    27:39:void addExtraInterfaces(java.util.List):520 -> c
+    40:40:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):646:646 -> c
+    41:41:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> c
+    41:41:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):646 -> c
+    42:42:long invalidChecksumRequest(com.android.tools.r8.graph.DexProgramClass):646:646 -> c
     1:1:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$2(com.android.tools.r8.graph.DexEncodedMethod):163:163 -> d
     2:2:void forEachProgramDirectMethod(java.util.function.Consumer):175:175 -> d
+    3:3:void replaceInterfaces(java.util.List):497:497 -> d
+    4:10:void clearInterfaces():505:511 -> d
+    4:10:void replaceInterfaces(java.util.List):500 -> d
+    11:11:void replaceInterfaces(java.util.List):501:501 -> d
     com.android.tools.r8.graph.DexProgramClass asProgramClass() -> e
     1:1:void forEachProgramField(java.util.function.Consumer):149:149 -> e
     2:2:com.android.tools.r8.graph.ProgramMethod lambda$directProgramMethods$3(com.android.tools.r8.graph.DexEncodedMethod):167:167 -> e
@@ -19540,28 +19614,28 @@
     5:5:java.lang.Iterable getTypes():36 -> a
     5:5:java.lang.Iterable getBaseTypes(com.android.tools.r8.graph.DexItemFactory):32 -> a
     6:6:java.lang.Iterable getBaseTypes(com.android.tools.r8.graph.DexItemFactory):32:32 -> a
-    7:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):72:73 -> a
+    7:8:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):76:77 -> a
     9:252:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:243 -> a
-    9:252:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):73 -> a
-    253:254:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):74:75 -> a
+    9:252:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):77 -> a
+    253:254:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):78:79 -> a
     255:256:void com.android.tools.r8.graph.DexTypeList.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):53:54 -> a
-    255:256:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):75 -> a
-    257:257:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):81:81 -> a
-    258:260:int slowCompareTo(com.android.tools.r8.graph.DexProto):86:88 -> a
+    255:256:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):79 -> a
+    257:257:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):85:85 -> a
+    258:260:int slowCompareTo(com.android.tools.r8.graph.DexProto):90:92 -> a
     261:273:int com.android.tools.r8.graph.DexTypeList.slowCompareTo(com.android.tools.r8.graph.DexTypeList):97:109 -> a
-    261:273:int slowCompareTo(com.android.tools.r8.graph.DexProto):88 -> a
-    274:276:int slowCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):95:97 -> a
+    261:273:int slowCompareTo(com.android.tools.r8.graph.DexProto):92 -> a
+    274:276:int slowCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):99:101 -> a
     277:289:int com.android.tools.r8.graph.DexTypeList.slowCompareTo(com.android.tools.r8.graph.DexTypeList,com.android.tools.r8.naming.NamingLens):113:125 -> a
-    277:289:int slowCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):97 -> a
-    290:297:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):112:119 -> a
+    277:289:int slowCompareTo(com.android.tools.r8.graph.DexProto,com.android.tools.r8.naming.NamingLens):101 -> a
+    290:297:java.lang.String toDescriptorString(com.android.tools.r8.naming.NamingLens):116:123 -> a
     1:1:java.lang.Iterable getParameterBaseTypes(com.android.tools.r8.graph.DexItemFactory):28:28 -> b
     2:2:com.android.tools.r8.graph.DexType lambda$getParameterBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):28:28 -> b
-    1:5:boolean computeEquals(java.lang.Object):57:61 -> c
+    1:5:boolean computeEquals(java.lang.Object):61:65 -> c
     1:1:com.android.tools.r8.graph.DexType getParameter(int):45:45 -> g
-    1:1:java.lang.String toDescriptorString():108:108 -> l
-    1:1:java.lang.String toSmaliString():104 -> l
-    1:3:int computeHashCode():50:52 -> p
-    1:1:java.lang.String toString():68:68 -> toString
+    1:1:java.lang.String toDescriptorString():112:112 -> l
+    1:1:java.lang.String toSmaliString():108 -> l
+    1:3:int computeHashCode():54:56 -> p
+    1:1:java.lang.String toString():72:72 -> toString
 com.android.tools.r8.graph.DexReference -> com.android.tools.r8.graph.U:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():12:12 -> <clinit>
@@ -19570,10 +19644,11 @@
     void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer) -> a
     java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function) -> a
     void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection) -> a
-    1:1:int referenceCompareTo(com.android.tools.r8.graph.DexReference):76:76 -> a
+    1:1:int referenceCompareTo(com.android.tools.r8.graph.DexReference):78:78 -> a
     2:2:boolean isDexType():0:0 -> a
-    2:2:int referenceCompareTo(com.android.tools.r8.graph.DexReference):80 -> a
-    3:9:int referenceCompareTo(com.android.tools.r8.graph.DexReference):81:87 -> a
+    2:2:int referenceCompareTo(com.android.tools.r8.graph.DexReference):82 -> a
+    3:9:int referenceCompareTo(com.android.tools.r8.graph.DexReference):83:89 -> a
+    com.android.tools.r8.graph.DexType getContextType() -> k
     com.android.tools.r8.graph.DexField asDexField() -> q
     com.android.tools.r8.graph.DexMember asDexMember() -> r
     com.android.tools.r8.graph.DexMethod asDexMethod() -> s
@@ -19582,8 +19657,8 @@
     boolean isDexMember() -> v
     boolean isDexMethod() -> w
     1:1:boolean isDexType():0:0 -> x
-    1:1:int referenceTypeOrder():65 -> x
-    2:5:int referenceTypeOrder():68:71 -> x
+    1:1:int referenceTypeOrder():67 -> x
+    2:5:int referenceTypeOrder():70:73 -> x
 com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.V:
     boolean $assertionsDisabled -> e
     int size -> f
@@ -19655,81 +19730,82 @@
     1:7:void <clinit>():39:45 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexString):50:50 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexString):48:52 -> <init>
-    1:4:java.lang.String getName():468:471 -> A
-    1:1:int getNumberOfLeadingSquareBrackets():378:378 -> B
-    1:1:java.lang.String getPackageDescriptor():464:464 -> C
-    1:1:java.lang.String getPackageName():492:492 -> D
-    1:2:java.lang.String getSimpleName():475:476 -> E
-    1:1:boolean isArrayType():266:266 -> F
-    1:1:boolean isBooleanType():228:228 -> G
-    1:1:boolean isByteType():232:232 -> H
-    1:1:boolean isCharType():236:236 -> I
-    1:1:boolean isClassType():271:271 -> J
-    1:16:boolean isD8R8SynthesizedClassType():300:315 -> K
-    1:1:boolean isDoubleType():256:256 -> L
-    1:1:boolean isFloatType():248:248 -> M
-    1:1:boolean isIntType():244:244 -> N
-    1:2:boolean isLegacySynthesizedTypeAllowedDuplication():319:320 -> O
-    3:4:boolean oldSynthesizedName(java.lang.String):338:339 -> O
-    3:4:boolean isLegacySynthesizedTypeAllowedDuplication():320 -> O
-    1:1:boolean isLongType():252:252 -> P
-    1:2:boolean isNullValueType():260:261 -> Q
-    1:4:boolean isPrimitiveArrayType():282:285 -> R
-    1:1:boolean isPrimitiveType():220:220 -> S
-    1:2:boolean isReferenceType():276:277 -> T
-    1:1:boolean isShortType():240:240 -> U
-    1:1:boolean isVoidType():224:224 -> V
-    1:1:boolean isWideType():289:289 -> W
-    1:4:java.lang.String toBinaryName():119:122 -> X
-    5:8:java.lang.String toBinaryName():120:123 -> X
-    1:1:java.lang.String toDescriptorString():115:115 -> Y
-    1:1:char toShorty():165:165 -> Z
+    1:4:java.lang.String getName():473:476 -> A
+    1:1:int getNumberOfLeadingSquareBrackets():383:383 -> B
+    1:1:java.lang.String getPackageDescriptor():469:469 -> C
+    1:1:java.lang.String getPackageName():497:497 -> D
+    1:2:java.lang.String getSimpleName():480:481 -> E
+    1:1:boolean isArrayType():271:271 -> F
+    1:1:boolean isBooleanType():233:233 -> G
+    1:1:boolean isByteType():237:237 -> H
+    1:1:boolean isCharType():241:241 -> I
+    1:1:boolean isClassType():276:276 -> J
+    1:16:boolean isD8R8SynthesizedClassType():305:320 -> K
+    1:1:boolean isDoubleType():261:261 -> L
+    1:1:boolean isFloatType():253:253 -> M
+    1:1:boolean isIntType():249:249 -> N
+    1:2:boolean isLegacySynthesizedTypeAllowedDuplication():324:325 -> O
+    3:4:boolean oldSynthesizedName(java.lang.String):343:344 -> O
+    3:4:boolean isLegacySynthesizedTypeAllowedDuplication():325 -> O
+    1:1:boolean isLongType():257:257 -> P
+    1:2:boolean isNullValueType():265:266 -> Q
+    1:4:boolean isPrimitiveArrayType():287:290 -> R
+    1:1:boolean isPrimitiveType():225:225 -> S
+    1:2:boolean isReferenceType():281:282 -> T
+    1:1:boolean isShortType():245:245 -> U
+    1:1:boolean isVoidType():229:229 -> V
+    1:1:boolean isWideType():294:294 -> W
+    1:4:java.lang.String toBinaryName():124:127 -> X
+    5:8:java.lang.String toBinaryName():125:128 -> X
+    1:1:java.lang.String toDescriptorString():120:120 -> Y
+    1:1:char toShorty():170:170 -> Z
     1:1:int slowCompareTo(java.lang.Object):39:39 -> a
     2:2:int slowCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens):39:39 -> a
-    3:3:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):96:96 -> a
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    4:4:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):97 -> a
-    5:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):97:104 -> a
-    13:13:boolean isSamePackage(com.android.tools.r8.graph.DexType):111:111 -> a
-    14:14:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):131:131 -> a
-    15:15:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):139:139 -> a
-    16:16:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):148:148 -> a
-    17:18:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):181:182 -> a
+    3:3:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):101:101 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    4:4:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):102 -> a
+    5:12:boolean isAlwaysNull(com.android.tools.r8.graph.AppView):102:109 -> a
+    13:13:boolean isSamePackage(com.android.tools.r8.graph.DexType):116:116 -> a
+    14:14:java.lang.Object apply(java.util.function.Function,java.util.function.Function,java.util.function.Function):136:136 -> a
+    15:15:void accept(java.util.function.Consumer,java.util.function.Consumer,java.util.function.Consumer):144:144 -> a
+    16:16:void accept(java.util.function.BiConsumer,java.util.function.BiConsumer,java.util.function.BiConsumer,java.lang.Object):153:153 -> a
+    17:18:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):186:187 -> a
     19:262:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):0:243 -> a
-    19:262:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):182 -> a
-    263:263:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):194:194 -> a
-    264:266:int slowCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):214:216 -> a
-    267:267:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    267:267:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):79 -> a
-    268:268:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):80:80 -> a
-    269:277:boolean isSynthesizedTypeThatCouldBeDuplicated(java.lang.String):326:334 -> a
-    278:280:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):413:415 -> a
-    281:285:com.android.tools.r8.graph.DexType addSuffix(java.lang.String,com.android.tools.r8.graph.DexItemFactory):430:434 -> a
-    286:286:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):438:438 -> a
-    287:291:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):442:446 -> a
-    292:295:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):444:447 -> a
-    296:304:java.lang.String getPackageOrName(boolean):451:459 -> a
-    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):209:209 -> b
-    2:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):385:392 -> b
-    10:14:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):390:394 -> b
-    15:22:com.android.tools.r8.graph.DexType replacePackage(java.lang.String,com.android.tools.r8.graph.DexItemFactory):419:426 -> b
-    1:2:boolean computeEquals(java.lang.Object):66:67 -> c
-    3:5:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):480:482 -> c
+    19:262:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):187 -> a
+    263:263:int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping):199:199 -> a
+    264:266:int slowCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.NamingLens):219:221 -> a
+    267:267:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    267:267:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):84 -> a
+    268:268:boolean classInitializationMayHaveSideEffects(com.android.tools.r8.graph.AppView,java.util.function.Predicate,java.util.Set):85:85 -> a
+    269:277:boolean isSynthesizedTypeThatCouldBeDuplicated(java.lang.String):331:339 -> a
+    278:280:com.android.tools.r8.graph.DexType replaceBaseType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):418:420 -> a
+    281:285:com.android.tools.r8.graph.DexType addSuffix(java.lang.String,com.android.tools.r8.graph.DexItemFactory):435:439 -> a
+    286:286:com.android.tools.r8.graph.DexType toArrayType(int,com.android.tools.r8.graph.DexItemFactory):443:443 -> a
+    287:291:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):447:451 -> a
+    292:295:com.android.tools.r8.graph.DexType toArrayElementType(com.android.tools.r8.graph.DexItemFactory):449:452 -> a
+    296:304:java.lang.String getPackageOrName(boolean):456:464 -> a
+    1:1:int slowCompareTo(com.android.tools.r8.graph.DexType):214:214 -> b
+    2:9:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):390:397 -> b
+    10:14:com.android.tools.r8.graph.DexType toBaseType(com.android.tools.r8.graph.DexItemFactory):395:399 -> b
+    15:22:com.android.tools.r8.graph.DexType replacePackage(java.lang.String,com.android.tools.r8.graph.DexItemFactory):424:431 -> b
+    1:2:boolean computeEquals(java.lang.Object):71:72 -> c
+    3:5:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):485:487 -> c
     6:320:java.lang.String com.android.tools.r8.utils.DescriptorUtils.replaceSimpleClassNameInDescriptor(java.lang.String,java.lang.String):0:314 -> c
-    6:320:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):482 -> c
+    6:320:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):487 -> c
     321:321:int com.android.tools.r8.utils.DescriptorUtils.getSimpleClassNameIndex(java.lang.String):327:327 -> c
     321:321:java.lang.String com.android.tools.r8.utils.DescriptorUtils.replaceSimpleClassNameInDescriptor(java.lang.String,java.lang.String):315 -> c
-    321:321:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):482 -> c
+    321:321:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):487 -> c
     322:322:java.lang.String com.android.tools.r8.utils.DescriptorUtils.replaceSimpleClassNameInDescriptor(java.lang.String,java.lang.String):315:315 -> c
-    322:322:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):482 -> c
-    323:323:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):481:481 -> c
-    1:1:java.lang.String toSmaliString():171:171 -> l
-    1:9:java.lang.String toSourceString():153:161 -> m
-    1:1:int computeHashCode():61:61 -> p
+    322:322:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):487 -> c
+    323:323:com.android.tools.r8.graph.DexType withSimpleName(java.lang.String,com.android.tools.r8.graph.DexItemFactory):486:486 -> c
+    com.android.tools.r8.graph.DexType getContextType() -> k
+    1:1:java.lang.String toSmaliString():176:176 -> l
+    1:9:java.lang.String toSourceString():158:166 -> m
+    1:1:int computeHashCode():66:66 -> p
     com.android.tools.r8.graph.DexType asDexType() -> t
-    1:1:java.lang.String toString():176:176 -> toString
-    1:16:int elementSizeForPrimitiveArrayType():357:372 -> y
-    1:2:java.lang.String getInternalName():487:488 -> z
+    1:1:java.lang.String toString():181:181 -> toString
+    1:16:int elementSizeForPrimitiveArrayType():362:377 -> y
+    1:2:java.lang.String getInternalName():492:493 -> z
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.X:
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> a
     boolean $assertionsDisabled -> b
@@ -19745,6 +19821,7 @@
     1:1:boolean isEmpty():73:73 -> isEmpty
     1:1:java.util.Iterator iterator():130:130 -> iterator
     1:1:com.android.tools.r8.graph.DexTypeList empty():24:24 -> p
+    1:7:com.android.tools.r8.graph.DexTypeList getSorted():134:140 -> q
     1:1:int size():77:77 -> size
     1:8:java.lang.String toString():86:93 -> toString
 com.android.tools.r8.graph.DexValue -> com.android.tools.r8.graph.Y:
@@ -19936,8 +20013,8 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):982 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):983:984 -> a
     8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):995:995 -> a
-    9:1126:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):0:1117 -> a
-    9:1126:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):995 -> a
+    9:1123:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createDoubleConstant(double,com.android.tools.r8.graph.DebugLocalInfo):0:1114 -> a
+    9:1123:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):995 -> a
     1:2:boolean equals(java.lang.Object):1008:1009 -> equals
     1:1:int hashCode():1000:1000 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():989:989 -> p
@@ -19978,8 +20055,8 @@
     5:5:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):894 -> a
     6:7:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):895:896 -> a
     8:8:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):907:907 -> a
-    9:1130:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):0:1121 -> a
-    9:1130:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):907 -> a
+    9:1127:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createFloatConstant(float,com.android.tools.r8.graph.DebugLocalInfo):0:1118 -> a
+    9:1127:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):907 -> a
     1:2:boolean equals(java.lang.Object):920:921 -> equals
     1:1:int hashCode():912:912 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():901:901 -> p
@@ -20044,8 +20121,8 @@
     2:2:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):785:785 -> a
     3:3:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):810:810 -> a
     4:4:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):839:839 -> a
-    5:1138:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):0:1133 -> a
-    5:1138:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):839 -> a
+    5:1135:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createLongConstant(long,com.android.tools.r8.graph.DebugLocalInfo):0:1130 -> a
+    5:1135:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):839 -> a
     1:1:boolean equals(java.lang.Object):828:828 -> equals
     1:1:int hashCode():820:820 -> hashCode
     1:1:java.lang.Object asAsmEncodedObject():815:815 -> p
@@ -20084,10 +20161,10 @@
     java.lang.Object getBoxedValue() -> I
     1:1:com.android.tools.r8.graph.DexValue$DexValueKind getValueKind():1576:1576 -> J
     long getRawValue() -> X
-    1:1169:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):0:1168 -> a
-    1:1169:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1635 -> a
-    1170:1170:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1581:1581 -> a
-    1171:1171:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1591:1591 -> a
+    1:1166:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createConstNull(com.android.tools.r8.graph.DebugLocalInfo):0:1165 -> a
+    1:1166:com.android.tools.r8.ir.code.ConstInstruction asConstInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DebugLocalInfo):1635 -> a
+    1167:1167:com.android.tools.r8.graph.DexType getType(com.android.tools.r8.graph.DexItemFactory):1581:1581 -> a
+    1168:1168:void writeTo(com.android.tools.r8.dex.DexOutputBuffer,com.android.tools.r8.graph.ObjectToOffsetMapping):1591:1591 -> a
     1:1:boolean equals(java.lang.Object):1624:1624 -> equals
     java.lang.Object asAsmEncodedObject() -> p
 com.android.tools.r8.graph.DexValue$DexValueNumber -> com.android.tools.r8.graph.Y$s:
@@ -20209,7 +20286,7 @@
     1:1:java.util.Collection classpathClasses():71:71 -> j
     1:1:java.util.Collection libraryClasses():67:67 -> k
     1:4:boolean verifyCodeObjectsOwners():160:163 -> l
-    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):157:157 -> l
+    5:5:java.lang.Iterable com.android.tools.r8.graph.DexClass.methods(java.util.function.Predicate):159:159 -> l
     5:5:boolean verifyCodeObjectsOwners():163 -> l
     6:14:boolean verifyCodeObjectsOwners():163:171 -> l
 com.android.tools.r8.graph.DirectMappedDexApplication$1 -> com.android.tools.r8.graph.Z$a:
@@ -20226,7 +20303,7 @@
     com.android.tools.r8.graph.DexApplication$Builder self() -> d
     1:1:com.android.tools.r8.graph.DirectMappedDexApplication$Builder replaceLibraryClasses(java.util.Collection):203:203 -> d
     1:15:com.android.tools.r8.graph.DirectMappedDexApplication build():231:245 -> e
-com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.n9:
+com.android.tools.r8.graph.EnclosingMethodAttribute -> com.android.tools.r8.internal.w9:
     com.android.tools.r8.graph.DexType enclosingClass -> c
     com.android.tools.r8.graph.DexMethod enclosingMethod -> d
     boolean $assertionsDisabled -> a
@@ -20242,7 +20319,7 @@
     1:1:boolean equals(java.lang.Object):66:66 -> equals
     1:2:int hashCode():60:61 -> hashCode
     1:4:java.lang.String toString():82:85 -> toString
-com.android.tools.r8.graph.EnumValueInfoMapCollection -> com.android.tools.r8.internal.S9:
+com.android.tools.r8.graph.EnumValueInfoMapCollection -> com.android.tools.r8.internal.ba:
     java.util.Map maps -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection$1):13:13 -> <init>
     2:3:void <init>(java.util.Map):21:22 -> <init>
@@ -20256,18 +20333,18 @@
     2:2:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap getEnumValueInfoMap(com.android.tools.r8.graph.DexType):26:26 -> b
     1:1:java.util.Set enumSet():38:38 -> c
     1:1:boolean isEmpty():30:30 -> d
-com.android.tools.r8.graph.EnumValueInfoMapCollection$1 -> com.android.tools.r8.internal.S9$a:
-com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder -> com.android.tools.r8.internal.S9$b:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$1 -> com.android.tools.r8.internal.ba$a:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder -> com.android.tools.r8.internal.ba$b:
     com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder builder -> a
     1:1:void <init>():59:59 -> <init>
     1:4:com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder put(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):64:67 -> a
     5:8:com.android.tools.r8.graph.EnumValueInfoMapCollection build():72:75 -> a
-com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo -> com.android.tools.r8.internal.S9$c:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo -> com.android.tools.r8.internal.ba$c:
     com.android.tools.r8.graph.DexType type -> a
     int ordinal -> b
     1:3:void <init>(com.android.tools.r8.graph.DexType,int):122:124 -> <init>
     1:1:int convertToInt():128:128 -> a
-com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap -> com.android.tools.r8.internal.S9$d:
+com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap -> com.android.tools.r8.internal.ba$d:
     java.util.LinkedHashMap map -> a
     1:2:void <init>(java.util.LinkedHashMap):83:84 -> <init>
     1:1:java.util.Set enumValues():88:88 -> a
@@ -20282,32 +20359,42 @@
     2:2:boolean hasEnumValueInfo(com.android.tools.r8.graph.DexField):96:96 -> b
 com.android.tools.r8.graph.FieldAccessFlags -> com.android.tools.r8.graph.a0:
     boolean $assertionsDisabled -> e
+    int $r8$clinit -> f
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):44:44 -> <init>
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> E
-    1:1:int getAsCfAccessFlags():72 -> E
+    1:1:int getAsCfAccessFlags():76 -> E
     1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> F
-    1:1:int getAsDexAccessFlags():77 -> F
+    1:1:int getAsDexAccessFlags():81 -> F
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> G
-    1:1:boolean isEnum():97 -> G
+    1:1:boolean isEnum():101 -> G
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> H
-    1:1:boolean isTransient():89 -> H
+    1:1:boolean isTransient():93 -> H
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> I
-    1:1:boolean isVolatile():81 -> I
+    1:1:boolean isVolatile():85 -> I
     1:6:java.util.List getNames():21:26 -> c
     1:6:java.util.List getPredicates():31:36 -> e
-    7:7:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):67:67 -> e
+    7:7:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):71:71 -> e
     8:8:void <init>(int):40:40 -> e
-    8:8:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):67 -> e
-    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):63:63 -> f
+    8:8:com.android.tools.r8.graph.FieldAccessFlags fromCfAccessFlags(int):71 -> e
+    1:1:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):67:67 -> f
     2:2:void <init>(int):40:40 -> f
-    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):63 -> f
-    1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):58:59 -> g
+    2:2:com.android.tools.r8.graph.FieldAccessFlags fromDexAccessFlags(int):67 -> f
+    1:2:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):62:63 -> g
     3:3:void <init>(int):40:40 -> g
-    3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):59 -> g
-com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.na:
-com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.oa:
-com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.pa:
+    3:3:com.android.tools.r8.graph.FieldAccessFlags fromSharedAccessFlags(int):63 -> g
+com.android.tools.r8.graph.FieldAccessFlags$Builder -> com.android.tools.r8.graph.a0$a:
+    1:1:void <init>():111:111 -> <init>
+    com.android.tools.r8.graph.AccessFlags$BuilderBase self() -> a
+    1:1:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.AccessFlags$BuilderBase.build():319:319 -> c
+    1:1:com.android.tools.r8.graph.AccessFlags build():0 -> c
+    1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setStatic():309:309 -> d
+    1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():0 -> d
+    1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setSynthetic():314:315 -> e
+    1:2:com.android.tools.r8.graph.AccessFlags$BuilderBase setSynthetic():0 -> e
+com.android.tools.r8.graph.FieldAccessInfo -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.graph.FieldAccessInfoCollection -> com.android.tools.r8.internal.xa:
+com.android.tools.r8.graph.FieldAccessInfoCollectionImpl -> com.android.tools.r8.internal.ya:
     java.util.Map infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -20332,7 +20419,7 @@
     2:2:com.android.tools.r8.graph.FieldAccessInfo get(com.android.tools.r8.graph.DexField):14 -> b
     1:1:com.android.tools.r8.graph.FieldAccessInfoImpl get(com.android.tools.r8.graph.DexField):49:49 -> c
     2:2:boolean verifyMappingIsOneToOne():88:88 -> c
-com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.qa:
+com.android.tools.r8.graph.FieldAccessInfoImpl -> com.android.tools.r8.internal.za:
     com.android.tools.r8.graph.FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO -> a
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.graph.AbstractAccessContexts writesWithContexts -> e
@@ -20423,12 +20510,12 @@
     1:1:void <clinit>():54:54 -> <clinit>
     1:5:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):62:66 -> <init>
     1:1:com.android.tools.r8.graph.DexClassAndMember getResolutionPair():54:54 -> a
-    1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):43 -> a
+    1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):102 -> a
     2:2:com.android.tools.r8.graph.DexClass getInitialResolutionHolder():71:71 -> a
-    2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):44 -> a
+    2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):43 -> a
     2:2:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):102 -> a
-    3:3:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42:42 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):41:41 -> a
     3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):102 -> a
     4:4:com.android.tools.r8.graph.DexClass getInitialResolutionHolder():71:71 -> a
     1:1:com.android.tools.r8.graph.DexEncodedField getResolvedMember():91:91 -> b
@@ -20438,7 +20525,7 @@
     com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult asSuccessfulResolution() -> e
     1:1:com.android.tools.r8.graph.DexEncodedField getResolvedField():81:81 -> f
     1:1:com.android.tools.r8.graph.DexField getResolvedFieldReference():86:86 -> g
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> g
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> g
     2:2:com.android.tools.r8.graph.DexField getResolvedFieldReference():86 -> g
     boolean isSuccessfulResolution() -> i
     1:1:com.android.tools.r8.graph.DexClassAndField getResolutionPair():96:96 -> j
@@ -20452,7 +20539,7 @@
     com.android.tools.r8.graph.SuccessfulMemberResolutionResult asSuccessfulMemberResolutionResult() -> c
     boolean isFailedOrUnknownResolution() -> h
     1:1:com.android.tools.r8.graph.FieldResolutionResult$UnknownFieldResolutionResult access$100():146:146 -> j
-com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.Pa:
+com.android.tools.r8.graph.FinalInitClassLens -> com.android.tools.r8.internal.Ya:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):14:15 -> <init>
     1:1:com.android.tools.r8.graph.InitClassLens$Builder com.android.tools.r8.graph.InitClassLens.builder():13:13 -> a
@@ -20832,7 +20919,7 @@
     1:1:void <clinit>():9:9 -> <clinit>
     1:11:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):13:23 -> a
     12:12:boolean verifyNoDuplicateGenericDefinitions(com.android.tools.r8.graph.GenericSignature$DexDefinitionSignature,com.android.tools.r8.graph.DexAnnotationSet):19:19 -> a
-com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.internal.Ib:
+com.android.tools.r8.graph.GenericSignatureVisitor -> com.android.tools.r8.internal.Rb:
     1:1:void visitClassSignature(com.android.tools.r8.graph.GenericSignature$ClassSignature):20:20 -> a
     2:2:void visitMethodSignature(com.android.tools.r8.graph.GenericSignature$MethodTypeSignature):24:24 -> a
     3:3:void visitFormalTypeParameters(java.util.List):32:32 -> a
@@ -20866,7 +20953,7 @@
     1:1:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):388 -> a
     2:7:com.android.tools.r8.graph.DexReference lookupReference(com.android.tools.r8.graph.DexReference):389:394 -> a
     8:16:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):306:314 -> a
-    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> a
     17:17:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):315 -> a
     18:18:com.android.tools.r8.graph.DexEncodedMethod mapDexEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):316:316 -> a
     19:19:com.android.tools.r8.graph.ProgramMethod mapProgramMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexDefinitionSupplier):322:322 -> a
@@ -20891,22 +20978,22 @@
     51:55:void lambda$rewriteCallSites$2(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Map,com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.utils.collections.ProgramMethodSet):495:499 -> a
     56:56:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$rewriteCallSites$1(com.android.tools.r8.graph.DexCallSite):498:498 -> a
     57:57:void lambda$rewriteReferenceKeys$3(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexReference,java.lang.Object):527:527 -> a
-    58:60:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethods(java.util.Set):540:542 -> a
-    61:61:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):292:292 -> a
-    61:61:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethods(java.util.Set):543 -> a
-    62:64:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethods(java.util.Set):543:545 -> a
-    65:67:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):549:551 -> a
-    68:68:void lambda$rewriteFieldKeys$4(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):550:550 -> a
-    69:69:void lambda$rewriteTypeKeys$5(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexType,java.lang.Object):565:565 -> a
-    70:87:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):571:588 -> a
-    88:328:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:240 -> a
-    88:328:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):588 -> a
-    329:333:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):591:595 -> a
-    334:486:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):0:152 -> a
-    334:486:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):595 -> a
-    487:487:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
-    487:487:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):600 -> a
-    488:502:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):600:614 -> a
+    58:59:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):540:541 -> a
+    60:60:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):292:292 -> a
+    60:60:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):542 -> a
+    61:63:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteMethods(java.util.Set):542:544 -> a
+    64:66:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteFieldKeys(java.util.Map):557:559 -> a
+    67:67:void lambda$rewriteFieldKeys$4(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexField,java.lang.Object):558:558 -> a
+    68:68:void lambda$rewriteTypeKeys$5(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexType,java.lang.Object):573:573 -> a
+    69:86:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):579:596 -> a
+    87:325:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:238 -> a
+    87:325:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):596 -> a
+    326:330:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):599:603 -> a
+    331:483:boolean com.android.tools.r8.graph.DexField.match(com.android.tools.r8.graph.DexField):0:152 -> a
+    331:483:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):603 -> a
+    484:484:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> a
+    484:484:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):608 -> a
+    485:499:boolean verifyMappingToOriginalProgram(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):608:622 -> a
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens asNonIdentityLens() -> b
     java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType) -> b
     com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField) -> b
@@ -20920,12 +21007,16 @@
     9:9:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):513 -> b
     10:11:com.android.tools.r8.graph.DexReference rewriteReference(com.android.tools.r8.graph.DexReference):513:514 -> b
     12:14:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteReferenceKeys(java.util.Map):526:528 -> b
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):555:560 -> b
+    15:17:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsSorted(java.util.Set):548:550 -> b
+    18:18:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):292:292 -> b
+    18:18:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsSorted(java.util.Set):551 -> b
+    19:21:com.android.tools.r8.com.google.common.collect.ImmutableSortedSet rewriteMethodsSorted(java.util.Set):551:553 -> b
     com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType) -> c
     1:2:com.android.tools.r8.graph.DexMethod lookupMethod(com.android.tools.r8.graph.DexMethod):340:341 -> c
     3:3:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):362:362 -> c
     4:4:com.android.tools.r8.graph.GraphLens getIdentityLens():415:415 -> c
-    5:7:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteTypeKeys(java.util.Map):564:566 -> c
+    5:10:com.android.tools.r8.com.google.common.collect.ImmutableSet rewriteTypes(java.util.Set):563:568 -> c
+    11:13:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteTypeKeys(java.util.Map):572:574 -> c
     boolean hasCodeRewritings() -> d
     com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod) -> d
     com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType) -> d
@@ -20949,20 +21040,20 @@
     1:1:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):238 -> b
     2:2:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):239:239 -> b
 com.android.tools.r8.graph.GraphLens$ClearCodeRewritingGraphLens -> com.android.tools.r8.graph.q0$c:
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):848:848 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):853:853 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):863:863 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):868:868 -> a
-    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):879:879 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):897:897 -> a
-    6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):908:908 -> a
-    7:7:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):914:914 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):858:858 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):873:873 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):902:902 -> b
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):886:886 -> d
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):856:856 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):861:861 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):871:871 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):876:876 -> a
+    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):887:887 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):905:905 -> a
+    6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):916:916 -> a
+    7:7:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):922:922 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):866:866 -> b
+    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):881:881 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):910:910 -> b
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):894:894 -> d
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
-    1:1:boolean isContextFreeForMethods():924:924 -> e
+    1:1:boolean isContextFreeForMethods():932:932 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
 com.android.tools.r8.graph.GraphLens$FieldLookupResult -> com.android.tools.r8.graph.q0$d:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$1):105:105 -> <init>
@@ -20980,40 +21071,40 @@
 com.android.tools.r8.graph.GraphLens$IdentityGraphLens -> com.android.tools.r8.graph.q0$e:
     com.android.tools.r8.graph.GraphLens$IdentityGraphLens INSTANCE -> b
     boolean $assertionsDisabled -> c
-    1:3:void <clinit>():742:744 -> <clinit>
-    1:1:void <init>():746:746 -> <init>
+    1:3:void <clinit>():750:752 -> <clinit>
+    1:1:void <init>():754:754 -> <init>
     com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField) -> a
     com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens) -> a
-    1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):805:805 -> a
+    1:1:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):813:813 -> a
     2:3:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> a
     2:3:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
-    2:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):805 -> a
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):805:805 -> a
-    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):820:820 -> a
+    2:3:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):813 -> a
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):813:813 -> a
+    5:5:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):828:828 -> a
     6:7:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> a
     6:7:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
-    6:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):820 -> a
-    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):820:820 -> a
-    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):819:819 -> a
-    10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):829:829 -> a
+    6:7:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):828 -> a
+    8:8:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):828:828 -> a
+    9:9:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):827:827 -> a
+    10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):837:837 -> a
     11:12:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> a
     11:12:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
-    11:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):829 -> a
-    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):829:829 -> a
-    14:14:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):828:828 -> a
+    11:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):837 -> a
+    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):837:837 -> a
+    14:14:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):836:836 -> a
     com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField) -> b
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):769:769 -> b
-    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):799:799 -> c
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):777:777 -> b
+    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):807:807 -> c
     boolean hasCodeRewritings() -> d
     com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType) -> d
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):811:811 -> d
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):819:819 -> d
     boolean isContextFreeForMethods() -> e
     boolean isIdentityLens() -> f
     boolean isNonIdentityLens() -> h
-    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens getInstance():749:749 -> i
-    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():742 -> i
+    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens getInstance():757:757 -> i
+    1:1:com.android.tools.r8.graph.GraphLens$IdentityGraphLens access$400():750 -> i
 com.android.tools.r8.graph.GraphLens$LookupFieldContinuation -> com.android.tools.r8.graph.q0$f:
     com.android.tools.r8.graph.GraphLens$FieldLookupResult lookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> a
 com.android.tools.r8.graph.GraphLens$LookupMethodContinuation -> com.android.tools.r8.graph.q0$g:
@@ -21063,138 +21154,138 @@
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> k
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> l
     java.util.Map typeMap -> h
-    1:1:void <clinit>():938:938 -> <clinit>
-    1:5:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):965:969 -> <init>
-    6:15:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):966:975 -> <init>
+    1:1:void <clinit>():946:946 -> <clinit>
+    1:5:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):973:977 -> <init>
+    6:15:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):974:983 -> <init>
     com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod) -> a
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):992:992 -> a
-    2:5:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1003:1006 -> a
-    6:7:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1011:1012 -> a
-    8:9:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1028:1029 -> a
-    10:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1063:1072 -> a
-    20:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1071:1074 -> a
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1000:1000 -> a
+    2:5:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1011:1014 -> a
+    6:7:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1019:1020 -> a
+    8:9:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1036:1037 -> a
+    10:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1071:1080 -> a
+    20:23:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1079:1082 -> a
     24:25:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> a
     24:25:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
-    24:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1075 -> a
-    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1075:1075 -> a
+    24:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1083 -> a
+    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1083:1083 -> a
     27:28:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):93:94 -> a
     27:28:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):0 -> a
-    27:28:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1076 -> a
-    29:32:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1076:1079 -> a
-    33:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1078:1078 -> a
-    34:39:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1077:1082 -> a
-    40:40:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1081:1081 -> a
-    41:54:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1080:1093 -> a
+    27:28:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1084 -> a
+    29:32:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1084:1087 -> a
+    33:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1086:1086 -> a
+    34:39:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1085:1090 -> a
+    40:40:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1089:1089 -> a
+    41:54:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1088:1101 -> a
     55:56:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> a
     55:56:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
-    55:56:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1094 -> a
-    57:59:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1094:1096 -> a
-    60:63:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1095:1098 -> a
-    64:64:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1131:1131 -> a
-    65:67:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1159:1161 -> a
-    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    68:68:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1161 -> a
-    69:69:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1165:1165 -> a
-    70:70:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    70:70:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1165 -> a
-    71:76:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1167:1172 -> a
+    55:56:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1102 -> a
+    57:59:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1102:1104 -> a
+    60:63:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1103:1106 -> a
+    64:64:com.android.tools.r8.graph.DexMethod lookupGetFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1139:1139 -> a
+    65:67:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1167:1169 -> a
+    68:68:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    68:68:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1169 -> a
+    69:69:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1173:1173 -> a
+    70:70:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    70:70:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1173 -> a
+    71:76:com.android.tools.r8.ir.code.Invoke$Type mapVirtualInterfaceInvocationTypes(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1175:1180 -> a
     com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type) -> b
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):997:997 -> b
-    2:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1017:1019 -> b
-    5:12:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1039:1046 -> b
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1005:1005 -> b
+    2:4:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1025:1027 -> b
+    5:12:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1047:1054 -> b
     13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getHolderType():30:30 -> b
-    13:13:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1046 -> b
-    14:14:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1046:1046 -> b
-    15:18:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1045:1048 -> b
+    13:13:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1054 -> b
+    14:14:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1054:1054 -> b
+    15:18:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1053:1056 -> b
     19:20:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):93:94 -> b
     19:20:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReboundReference(com.android.tools.r8.graph.DexMember):0 -> b
-    19:20:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1049 -> b
-    21:21:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1049:1049 -> b
+    19:20:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1057 -> b
+    21:21:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1057:1057 -> b
     22:23:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> b
     22:23:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> b
-    22:23:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1050 -> b
-    24:30:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1050:1056 -> b
+    22:23:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1058 -> b
+    24:30:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1058:1064 -> b
     31:32:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> b
     31:32:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$FieldLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> b
-    31:32:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1056 -> b
-    33:33:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1056:1056 -> b
-    34:34:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1136:1136 -> b
-    1:4:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1105:1108 -> d
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1034:1034 -> e
-    2:2:boolean isContextFreeForMethods():1179:1179 -> e
-    3:3:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):1184:1184 -> e
-    1:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1118:1119 -> f
-    1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):987:987 -> g
-    2:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1124:1125 -> g
-    1:1:com.android.tools.r8.graph.GraphLens$Builder builder():979:979 -> j
+    31:32:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1064 -> b
+    33:33:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1064:1064 -> b
+    34:34:com.android.tools.r8.graph.DexMethod lookupPutFieldForMethod(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):1144:1144 -> b
+    1:4:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1113:1116 -> d
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1042:1042 -> e
+    2:2:boolean isContextFreeForMethods():1187:1187 -> e
+    3:3:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):1192:1192 -> e
+    1:2:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1126:1127 -> f
+    1:1:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):995:995 -> g
+    2:3:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):1132:1133 -> g
+    1:1:com.android.tools.r8.graph.GraphLens$Builder builder():987:987 -> j
     boolean isLegitimateToHaveEmptyMappings() -> k
-    1:17:java.lang.String toString():1190:1206 -> toString
+    1:17:java.lang.String toString():1198:1214 -> toString
 com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens -> com.android.tools.r8.graph.q0$k:
     com.android.tools.r8.graph.GraphLens previousLens -> d
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     java.util.Map arrayTypeCache -> e
     boolean $assertionsDisabled -> b
-    1:1:void <clinit>():621:621 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):628:628 -> <init>
-    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):626:630 -> <init>
+    1:1:void <clinit>():629:629 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):636:636 -> <init>
+    2:6:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):634:638 -> <init>
     com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$lookupMethod$1(com.android.tools.r8.graph.GraphLens$MethodLookupResult) -> a
-    1:1:com.android.tools.r8.graph.GraphLens getPrevious():638:638 -> a
-    1:1:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):643 -> a
-    2:4:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):644:646 -> a
-    5:5:com.android.tools.r8.graph.GraphLens getPrevious():638:638 -> a
-    5:5:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):649 -> a
-    6:6:com.android.tools.r8.graph.GraphLens getPrevious():638:638 -> a
-    6:6:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):655 -> a
-    7:9:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):656:658 -> a
-    10:11:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):663:664 -> a
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():646:646 -> a
+    1:1:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):651 -> a
+    2:4:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):652:654 -> a
+    5:5:com.android.tools.r8.graph.GraphLens getPrevious():646:646 -> a
+    5:5:com.android.tools.r8.graph.GraphLens findPrevious(java.util.function.Predicate):657 -> a
+    6:6:com.android.tools.r8.graph.GraphLens getPrevious():646:646 -> a
+    6:6:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):663 -> a
+    7:9:void withAlternativeParentLens(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.utils.Action):664:666 -> a
+    10:11:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):671:672 -> a
     12:12:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():45:45 -> a
-    12:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):665 -> a
+    12:12:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):673 -> a
     13:13:java.util.stream.Stream com.android.tools.r8.graph.DexTypeList.stream():81:81 -> a
-    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):665 -> a
-    14:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):665:665 -> a
-    18:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):667:668 -> a
+    13:13:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):673 -> a
+    14:16:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):673:673 -> a
+    18:19:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):675:676 -> a
     20:21:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):88:89 -> a
     20:21:com.android.tools.r8.graph.GraphLens$MemberLookupResult$Builder com.android.tools.r8.graph.GraphLens$MethodLookupResult$Builder.setReference(com.android.tools.r8.graph.DexMember):0 -> a
-    20:21:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):668 -> a
-    22:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):668:673 -> a
-    28:28:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):703:703 -> a
-    29:29:com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$internalLookupField$2(com.android.tools.r8.graph.GraphLens$LookupFieldContinuation,com.android.tools.r8.graph.GraphLens$FieldLookupResult):704:704 -> a
-    30:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):710:710 -> a
-    34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$internalLookupMethod$3(com.android.tools.r8.graph.GraphLens$LookupMethodContinuation,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):714:714 -> a
+    20:21:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):676 -> a
+    22:27:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):676:681 -> a
+    28:28:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalLookupField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.GraphLens$LookupFieldContinuation):711:711 -> a
+    29:29:com.android.tools.r8.graph.GraphLens$FieldLookupResult lambda$internalLookupField$2(com.android.tools.r8.graph.GraphLens$LookupFieldContinuation,com.android.tools.r8.graph.GraphLens$FieldLookupResult):712:712 -> a
+    30:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalLookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.GraphLens$LookupMethodContinuation):718:718 -> a
+    34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$internalLookupMethod$3(com.android.tools.r8.graph.GraphLens$LookupMethodContinuation,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult):722:722 -> a
     com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens asNonIdentityLens() -> b
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
-    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):696:696 -> c
-    2:2:com.android.tools.r8.graph.GraphLens getPrevious():638:638 -> c
-    2:2:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):697 -> c
-    3:3:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):697:697 -> c
-    1:14:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):678:691 -> d
+    1:1:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):704:704 -> c
+    2:2:com.android.tools.r8.graph.GraphLens getPrevious():646:646 -> c
+    2:2:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):705 -> c
+    3:3:com.android.tools.r8.graph.DexType lookupClassType(com.android.tools.r8.graph.DexType):705:705 -> c
+    1:14:com.android.tools.r8.graph.DexType lookupType(com.android.tools.r8.graph.DexType):686:699 -> d
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
     boolean isIdentityLens() -> f
-    1:1:boolean lambda$lookupMethod$0(com.android.tools.r8.graph.DexType):666:666 -> f
+    1:1:boolean lambda$lookupMethod$0(com.android.tools.r8.graph.DexType):674:674 -> f
     boolean isNonIdentityLens() -> h
-    1:1:com.android.tools.r8.graph.GraphLens getPrevious():638:638 -> i
+    1:1:com.android.tools.r8.graph.GraphLens getPrevious():646:646 -> i
 com.android.tools.r8.graph.IndexedDexItem -> com.android.tools.r8.graph.u0:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     int getOffset(com.android.tools.r8.graph.ObjectToOffsetMapping) -> a
     1:1:void collectMixedSectionItems(com.android.tools.r8.dex.MixedSectionCollection):14:14 -> a
-com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.yd:
+com.android.tools.r8.graph.InitClassLens -> com.android.tools.r8.internal.Md:
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.graph.DexField getInitClassField(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.InitClassLens rewrittenWithLens(com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.graph.InitClassLens$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.graph.DefaultInitClassLens getDefault():17:17 -> b
-com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.yd$a:
+com.android.tools.r8.graph.InitClassLens$Builder -> com.android.tools.r8.internal.Md$a:
     java.util.Map mapping -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
     1:3:void <init>():28:30 -> <init>
     1:2:void map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):33:34 -> a
     3:3:com.android.tools.r8.graph.FinalInitClassLens build():38:38 -> a
-com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.Ld:
+com.android.tools.r8.graph.InnerClassAttribute -> com.android.tools.r8.internal.Zd:
     com.android.tools.r8.graph.DexString innerName -> f
     com.android.tools.r8.graph.DexType inner -> d
     boolean $assertionsDisabled -> a
@@ -21212,7 +21303,7 @@
     19:19:void com.android.tools.r8.graph.DexString.collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):243:243 -> a
     19:19:void collectIndexedItems(com.android.tools.r8.dex.IndexedItemCollection):96 -> a
     20:22:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.graph.AppView):101:103 -> a
-    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    23:23:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     23:23:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.graph.AppView):103 -> a
     24:35:com.android.tools.r8.graph.DexType getLiveContext(com.android.tools.r8.graph.AppView):104:115 -> a
     1:1:com.android.tools.r8.graph.DexType getInner():70:70 -> b
@@ -21221,7 +21312,7 @@
     1:1:boolean isAnonymous():62:62 -> e
     1:1:boolean isNamed():58:58 -> f
     1:4:java.lang.String toString():124:127 -> toString
-com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.be:
+com.android.tools.r8.graph.InstantiatedSubTypeInfo -> com.android.tools.r8.internal.pe:
     void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer) -> a
 com.android.tools.r8.graph.JarApplicationReader -> com.android.tools.r8.graph.v0:
     java.util.concurrent.ConcurrentHashMap stringCache -> e
@@ -21638,7 +21729,7 @@
     com.android.tools.r8.graph.DexClass clazz -> c
     1:7:void <init>(com.android.tools.r8.graph.DexClass,java.util.function.BiFunction,com.android.tools.r8.graph.JarApplicationReader,boolean,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions):304:310 -> <init>
     1:11:com.android.tools.r8.org.objectweb.asm.MethodVisitor visitMethod(int,java.lang.String,java.lang.String,java.lang.String,java.lang.String[]):316:326 -> a
-com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.Ul:
+com.android.tools.r8.graph.LazyCfCode$DebugParsingOptions -> com.android.tools.r8.internal.hm:
     boolean lineInfo -> a
     boolean localInfo -> b
     int asmReaderOptions -> c
@@ -21883,7 +21974,7 @@
     991:994:void visitTryCatchBlock(com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,java.lang.String):956:959 -> a
     995:1001:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):965:971 -> a
     1002:1008:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):967:973 -> a
-    1009:1010:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):87:88 -> a
+    1009:1010:void com.android.tools.r8.graph.CfCode$LocalVariableInfo.<init>(int,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel):88:89 -> a
     1009:1010:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):973 -> a
     1011:1011:void visitLocalVariable(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label,int):972:972 -> a
     1012:1012:com.android.tools.r8.graph.DebugLocalInfo canonicalize(com.android.tools.r8.graph.DebugLocalInfo):978:978 -> a
@@ -22006,7 +22097,7 @@
     3:3:com.android.tools.r8.graph.DexClass getHolder():7 -> p
     4:5:com.android.tools.r8.graph.DexLibraryClass getHolder():26:27 -> p
     4:5:com.android.tools.r8.graph.DexClass getHolder():7 -> p
-    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> t
+    com.android.tools.r8.graph.LibraryMethod asLibraryMethod() -> s
 com.android.tools.r8.graph.LookupCompletenessHelper -> com.android.tools.r8.graph.F0:
     java.util.Set pinnedInstantiations -> c
     java.util.Set pinnedMethods -> d
@@ -22021,13 +22112,13 @@
     13:21:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):48:56 -> a
     22:23:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):66:67 -> a
     22:23:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
-    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
+    24:24:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):446:446 -> a
     24:24:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):71 -> a
     24:24:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     25:31:boolean isMethodKeptInSuperTypeOrIsLibrary(com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):73:79 -> a
     25:31:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):57 -> a
     32:35:com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState computeCollectionState(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy):58:61 -> a
-com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.on:
+com.android.tools.r8.graph.LookupLambdaTarget -> com.android.tools.r8.internal.An:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexClassAndMethod method -> b
     1:1:void <clinit>():8:8 -> <clinit>
@@ -22074,12 +22165,12 @@
     com.android.tools.r8.graph.LookupResult$LookupResultSuccess$LookupResultCollectionState Complete -> a
     1:2:void <clinit>():135:136 -> <clinit>
     1:1:void <init>(java.lang.String,int):134:134 -> <init>
-com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.qn:
+com.android.tools.r8.graph.LookupTarget -> com.android.tools.r8.internal.Cn:
     boolean isLambdaTarget() -> f
     com.android.tools.r8.graph.DexClassAndMethod asMethodTarget() -> g
     com.android.tools.r8.graph.LookupLambdaTarget asLambdaTarget() -> l
     boolean isMethodTarget() -> m
-com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.co:
+com.android.tools.r8.graph.MemberResolutionResult -> com.android.tools.r8.internal.oo:
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy) -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):21:21 -> a
@@ -22088,53 +22179,67 @@
     boolean $assertionsDisabled -> e
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(int,int):61:61 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags copy():66:66 -> E
-    1:1:void demoteFromBridge():134:134 -> F
-    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> G
-    1:1:int getAsCfAccessFlags():96 -> G
-    1:2:int getAsDexAccessFlags():101:102 -> H
-    3:3:void unsetSynchronized():118:118 -> H
-    3:3:int getAsDexAccessFlags():103 -> H
-    4:4:void setDeclaredSynchronized():192:192 -> H
-    4:4:int getAsDexAccessFlags():104 -> H
-    5:5:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> H
-    5:5:int getAsDexAccessFlags():106 -> H
-    1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> I
-    1:1:boolean isAbstract():154 -> I
+    1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder builder():65:65 -> E
+    1:1:com.android.tools.r8.graph.MethodAccessFlags copy():70:70 -> F
+    1:1:void demoteFromBridge():143:143 -> G
+    1:1:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> H
+    1:1:int getAsCfAccessFlags():105 -> H
+    1:2:int getAsDexAccessFlags():110:111 -> I
+    3:3:void unsetSynchronized():127:127 -> I
+    3:3:int getAsDexAccessFlags():112 -> I
+    4:4:void setDeclaredSynchronized():207:207 -> I
+    4:4:int getAsDexAccessFlags():113 -> I
+    5:5:int com.android.tools.r8.graph.AccessFlags.materialize():61:61 -> I
+    5:5:int getAsDexAccessFlags():115 -> I
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> J
-    1:1:boolean isBridge():122 -> J
+    1:1:boolean isAbstract():163 -> J
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> K
-    1:1:boolean isConstructor():174 -> K
+    1:1:boolean isBridge():131 -> K
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> L
-    1:1:boolean isNative():146 -> L
+    1:1:boolean isConstructor():183 -> L
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> M
-    1:1:boolean isStrict():166 -> M
+    1:1:boolean isNative():155 -> M
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> N
-    1:1:boolean isSynchronized():110 -> N
+    1:1:boolean isStrict():175 -> N
     1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> O
-    1:1:boolean isVarargs():138 -> O
-    1:1:void setBridge():126:126 -> P
-    1:1:void setNative():150:150 -> Q
-    1:1:void unsetAbstract():162:162 -> R
-    1:1:void unsetBridge():130:130 -> S
-    1:1:void unsetConstructor():182:182 -> T
-    1:1:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):81:81 -> a
+    1:1:boolean isSynchronized():119 -> O
+    1:1:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> P
+    1:1:boolean isVarargs():147 -> P
+    1:1:void setBridge():135:135 -> Q
+    1:1:void setNative():159:159 -> R
+    1:1:void unsetAbstract():171:171 -> S
+    1:1:void unsetBridge():139:139 -> T
+    1:1:void unsetConstructor():197:197 -> U
+    1:1:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):90:90 -> a
     2:2:void <init>(int):57:57 -> a
-    2:2:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):82 -> a
-    1:3:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):75:77 -> b
+    2:2:com.android.tools.r8.graph.MethodAccessFlags fromCfAccessFlags(int,boolean):91 -> a
+    3:3:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):191:191 -> a
+    4:4:void setConstructor():187:187 -> a
+    4:4:void setConstructor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):192 -> a
+    1:3:com.android.tools.r8.graph.MethodAccessFlags fromSharedAccessFlags(int,boolean):84:86 -> b
     1:9:java.util.List getNames():32:40 -> c
     1:9:java.util.List getPredicates():45:53 -> e
-    10:10:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):86:86 -> e
+    10:10:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):95:95 -> e
     11:11:void <init>(int):57:57 -> e
-    11:11:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):86 -> e
+    11:11:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):95 -> e
     12:12:boolean com.android.tools.r8.graph.AccessFlags.isSet(int):240:240 -> e
-    12:12:boolean isDeclaredSynchronized():188 -> e
-    12:12:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):87 -> e
-    13:13:void setSynchronized():114:114 -> e
-    13:13:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):88 -> e
-    14:14:void unsetDeclaredSynchronized():196:196 -> e
-    14:14:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):89 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.ro:
+    12:12:boolean isDeclaredSynchronized():203 -> e
+    12:12:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):96 -> e
+    13:13:void setSynchronized():123:123 -> e
+    13:13:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):97 -> e
+    14:14:void unsetDeclaredSynchronized():211:211 -> e
+    14:14:com.android.tools.r8.graph.MethodAccessFlags fromDexAccessFlags(int):98 -> e
+com.android.tools.r8.graph.MethodAccessFlags$Builder -> com.android.tools.r8.graph.H0$a:
+    1:1:void <init>():217:217 -> <init>
+    com.android.tools.r8.graph.AccessFlags$BuilderBase self() -> a
+    1:1:com.android.tools.r8.graph.AccessFlags com.android.tools.r8.graph.AccessFlags$BuilderBase.build():319:319 -> c
+    1:1:com.android.tools.r8.graph.AccessFlags build():0 -> c
+    1:1:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():221:221 -> d
+    2:2:void com.android.tools.r8.graph.MethodAccessFlags.setConstructor():187:187 -> d
+    2:2:com.android.tools.r8.graph.MethodAccessFlags$Builder setConstructor():221 -> d
+    1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setStatic():309:309 -> e
+    1:1:com.android.tools.r8.graph.AccessFlags$BuilderBase setStatic():0 -> e
+com.android.tools.r8.graph.MethodAccessInfoCollection -> com.android.tools.r8.internal.Do:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -22158,8 +22263,8 @@
     1:1:com.android.tools.r8.graph.MethodAccessInfoCollection$SortedBuilder sortedBuilder():51:51 -> d
     2:2:void forEachSuperInvoke(java.util.function.BiConsumer):81:81 -> d
     1:1:void forEachVirtualInvoke(java.util.function.BiConsumer):85:85 -> e
-com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.qo:
-com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.ro$a:
+com.android.tools.r8.graph.MethodAccessInfoCollection$1 -> com.android.tools.r8.internal.Co:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Builder -> com.android.tools.r8.internal.Do$a:
     java.util.Map directInvokes -> a
     java.util.Map interfaceInvokes -> b
     java.util.Map staticInvokes -> c
@@ -22197,101 +22302,111 @@
     1:1:boolean registerInvokeStaticInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):175:175 -> h
     1:1:boolean registerInvokeSuperInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):183:183 -> i
     1:1:boolean registerInvokeVirtualInContext(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):191:191 -> j
-com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.so:
+com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder -> com.android.tools.r8.internal.Eo:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):212:212 -> <init>
     2:2:void <init>():216:216 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.to:
+com.android.tools.r8.graph.MethodAccessInfoCollection$IdentityBuilder -> com.android.tools.r8.internal.Fo:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):220:220 -> <init>
     2:2:void <init>():224:224 -> <init>
-com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.uo:
+com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier -> com.android.tools.r8.internal.Go:
     1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.graph.MethodAccessInfoCollection$1):235:235 -> <init>
     2:2:void <init>(java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map):243:243 -> <init>
     1:5:void addAll(com.android.tools.r8.graph.MethodAccessInfoCollection):247:251 -> a
-com.android.tools.r8.graph.MethodAccessInfoCollection$SortedBuilder -> com.android.tools.r8.internal.ro$b:
+com.android.tools.r8.graph.MethodAccessInfoCollection$SortedBuilder -> com.android.tools.r8.internal.Do$b:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessInfoCollection$1):228:228 -> <init>
     2:2:void <init>():231:231 -> <init>
     1:1:java.util.TreeMap lambda$new$0():231:231 -> g
-com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.vo:
+com.android.tools.r8.graph.MethodArrayBacking -> com.android.tools.r8.internal.Ho:
     com.android.tools.r8.graph.DexEncodedMethod[] virtualMethods -> c
     com.android.tools.r8.graph.DexEncodedMethod[] directMethods -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
     1:4:void <init>():20:23 -> <init>
     1:2:void lambda$verifyNoDuplicateMethods$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):29:30 -> a
-    3:4:java.util.List com.android.tools.r8.graph.MethodArrayBacking.directMethods():80:81 -> a
-    3:4:java.lang.Iterable directMethods():20 -> a
-    5:13:void addDirectMethods(java.util.Collection):86:94 -> a
-    14:15:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):122:123 -> a
-    16:228:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> a
-    16:228:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):123 -> a
-    229:229:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):124:124 -> a
-    230:231:void removeMethods(java.util.Set):132:133 -> a
-    232:238:com.android.tools.r8.graph.DexEncodedMethod[] removeMethodsHelper(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod[]):138:144 -> a
-    239:243:com.android.tools.r8.graph.DexEncodedMethod removeMethodWithIndex(int,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):149:153 -> a
-    244:245:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):159:160 -> a
-    246:246:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):222:222 -> a
-    247:459:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> a
-    247:459:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):223 -> a
-    460:460:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):232:232 -> a
-    461:463:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):274:276 -> a
-    464:464:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282:282 -> a
-    465:466:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodArrayBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod[]):299:300 -> a
-    465:466:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
-    467:679:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> a
-    467:679:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodArrayBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod[]):301 -> a
-    467:679:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
-    680:681:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodArrayBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod[]):302:303 -> a
-    680:681:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
-    682:682:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):283:283 -> a
-    683:683:void replaceAllDirectMethods(java.util.function.Function):360:360 -> a
-    684:684:void com.android.tools.r8.graph.MethodArrayBacking.clearDirectMethods():99:99 -> a
-    684:684:void replaceAllDirectMethods(java.util.function.Function):361 -> a
-    685:689:void replaceAllDirectMethods(java.util.function.Function):362:366 -> a
-    1:1:java.lang.Iterable methods():75:75 -> b
-    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    2:2:java.lang.Iterable methods():75 -> b
-    3:11:void addVirtualMethods(java.util.Collection):171:179 -> b
-    12:13:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):189:190 -> b
-    14:36:void virtualizeMethods(java.util.Set):195:217 -> b
-    37:37:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):247:247 -> b
-    38:39:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):252:253 -> b
-    40:43:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):258:261 -> b
-    44:45:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):313:314 -> b
-    46:258:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> b
-    46:258:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315 -> b
-    259:263:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):316:320 -> b
-    264:264:void replaceAllVirtualMethods(java.util.function.Function):371:371 -> b
-    265:265:void com.android.tools.r8.graph.MethodArrayBacking.clearVirtualMethods():184:184 -> b
-    265:265:void replaceAllVirtualMethods(java.util.function.Function):372 -> b
-    266:270:void replaceAllVirtualMethods(java.util.function.Function):373:377 -> b
-    1:1:int numberOfDirectMethods():43:43 -> c
-    2:2:void lambda$removeMethod$1(com.android.tools.r8.graph.DexEncodedMethod[]):106:106 -> c
-    3:3:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):237:237 -> c
-    4:216:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> c
-    4:216:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):238 -> c
-    217:217:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):267:267 -> c
-    218:218:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> c
-    218:218:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):267 -> c
-    219:221:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):267:269 -> c
-    222:228:void replaceDirectMethods(java.util.function.Function):335:341 -> c
-    1:1:int numberOfVirtualMethods():48:48 -> d
-    2:12:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):104:114 -> d
-    13:13:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> d
-    13:13:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):114 -> d
-    14:14:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):114:114 -> d
-    15:15:void lambda$removeMethod$2(com.android.tools.r8.graph.DexEncodedMethod[]):113:113 -> d
-    16:17:void replaceMethods(java.util.function.Function):329:330 -> d
-    1:1:int size():53:53 -> e
+    3:11:void addDirectMethods(java.util.Collection):86:94 -> a
+    12:12:void clearDirectMethods():99:99 -> a
+    13:14:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):122:123 -> a
+    15:231:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> a
+    15:231:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):123 -> a
+    232:232:com.android.tools.r8.graph.DexEncodedMethod removeMethodHelper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):124:124 -> a
+    233:234:void removeMethods(java.util.Set):132:133 -> a
+    235:241:com.android.tools.r8.graph.DexEncodedMethod[] removeMethodsHelper(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod[]):138:144 -> a
+    242:246:com.android.tools.r8.graph.DexEncodedMethod removeMethodWithIndex(int,com.android.tools.r8.graph.DexEncodedMethod[],java.util.function.Consumer):149:153 -> a
+    247:248:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):159:160 -> a
+    249:249:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):222:222 -> a
+    250:466:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> a
+    250:466:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):223 -> a
+    467:467:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):232:232 -> a
+    468:468:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):274:274 -> a
+    469:469:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    469:469:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):274 -> a
+    470:472:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):274:276 -> a
+    473:473:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282:282 -> a
+    474:475:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodArrayBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod[]):299:300 -> a
+    474:475:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
+    476:692:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> a
+    476:692:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodArrayBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod[]):301 -> a
+    476:692:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
+    693:694:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodArrayBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod[]):302:303 -> a
+    693:694:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):282 -> a
+    695:695:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):283:283 -> a
+    696:696:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    696:696:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):283 -> a
+    697:697:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):283:283 -> a
+    698:698:void replaceAllDirectMethods(java.util.function.Function):360:360 -> a
+    699:699:void com.android.tools.r8.graph.MethodArrayBacking.clearDirectMethods():99:99 -> a
+    699:699:void replaceAllDirectMethods(java.util.function.Function):361 -> a
+    700:704:void replaceAllDirectMethods(java.util.function.Function):362:366 -> a
+    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> b
+    1:1:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):258 -> b
+    2:4:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):259:261 -> b
+    5:13:void addVirtualMethods(java.util.Collection):171:179 -> b
+    14:14:void clearVirtualMethods():184:184 -> b
+    15:16:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):189:190 -> b
+    17:39:void virtualizeMethods(java.util.Set):195:217 -> b
+    40:40:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):247:247 -> b
+    41:42:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):252:253 -> b
+    43:44:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):313:314 -> b
+    45:261:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> b
+    45:261:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315 -> b
+    262:266:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):316:320 -> b
+    267:267:void replaceAllVirtualMethods(java.util.function.Function):371:371 -> b
+    268:268:void com.android.tools.r8.graph.MethodArrayBacking.clearVirtualMethods():184:184 -> b
+    268:268:void replaceAllVirtualMethods(java.util.function.Function):372 -> b
+    269:273:void replaceAllVirtualMethods(java.util.function.Function):373:377 -> b
+    1:2:java.util.List com.android.tools.r8.graph.MethodArrayBacking.directMethods():80:81 -> c
+    1:2:java.lang.Iterable directMethods():20 -> c
+    3:3:void lambda$removeMethod$1(com.android.tools.r8.graph.DexEncodedMethod[]):106:106 -> c
+    4:4:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):237:237 -> c
+    5:221:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> c
+    5:221:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):238 -> c
+    222:224:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):267:269 -> c
+    225:228:void replaceDirectMethods(java.util.function.Function):335:338 -> c
+    229:229:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> c
+    229:229:void replaceDirectMethods(java.util.function.Function):340 -> c
+    230:231:void replaceDirectMethods(java.util.function.Function):340:341 -> c
+    1:1:java.lang.Iterable methods():75:75 -> d
+    2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> d
+    2:2:java.lang.Iterable methods():75 -> d
+    3:7:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):104:108 -> d
+    8:8:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> d
+    8:8:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):108 -> d
+    9:15:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):108:114 -> d
+    16:16:void lambda$removeMethod$2(com.android.tools.r8.graph.DexEncodedMethod[]):113:113 -> d
+    17:18:void replaceMethods(java.util.function.Function):329:330 -> d
+    1:1:int numberOfDirectMethods():43:43 -> e
     2:2:void lambda$replaceDirectMethodWithVirtualMethod$3(com.android.tools.r8.graph.DexEncodedMethod[]):319:319 -> e
     3:8:void replaceVirtualMethods(java.util.function.Function):348:353 -> e
-    1:1:boolean verify():37:37 -> f
+    1:1:int numberOfVirtualMethods():48:48 -> f
     2:14:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):58:70 -> f
-    1:2:java.util.List com.android.tools.r8.graph.MethodArrayBacking.virtualMethods():165:166 -> g
-    1:2:java.lang.Iterable virtualMethods():20 -> g
-    1:2:boolean verifyNoDuplicateMethods():26:27 -> h
-    3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> h
-    3:3:boolean verifyNoDuplicateMethods():27 -> h
-com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.internal.wo:
+    1:1:int size():53:53 -> g
+    1:1:boolean verify():37:37 -> h
+    1:2:java.util.List com.android.tools.r8.graph.MethodArrayBacking.virtualMethods():165:166 -> i
+    1:2:java.lang.Iterable virtualMethods():20 -> i
+    1:2:boolean verifyNoDuplicateMethods():26:27 -> j
+    3:3:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> j
+    3:3:boolean verifyNoDuplicateMethods():27 -> j
+com.android.tools.r8.graph.MethodCollection -> com.android.tools.r8.internal.Io:
     com.android.tools.r8.graph.DexClass holder -> b
     com.android.tools.r8.graph.MethodCollectionBacking backing -> c
     com.android.tools.r8.graph.DexEncodedMethod cachedClassInitializer -> d
@@ -22334,37 +22449,40 @@
     24:24:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> a
     24:24:void removeMethods(java.util.Set):285 -> a
     25:25:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):290:290 -> a
-    26:26:boolean com.android.tools.r8.graph.MethodCollection.verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):354:354 -> a
+    26:26:boolean com.android.tools.r8.graph.MethodCollection.verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):358:358 -> a
     26:26:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):290 -> a
     27:27:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> a
     27:27:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> a
     27:27:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):291 -> a
     28:28:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):292:292 -> a
-    29:30:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):358:359 -> a
+    29:30:boolean verifyCorrectnessOfMethodHolders(java.lang.Iterable):362:363 -> a
     1:1:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):93:93 -> b
-    2:2:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> b
+    2:2:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> b
     2:2:void forEachMethodMatching(java.util.function.Predicate,java.util.function.Consumer):93 -> b
     3:4:void lambda$forEachMethodMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):95:96 -> b
-    5:5:java.lang.Iterable directMethods():145:145 -> b
-    6:6:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):153:153 -> b
-    7:7:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):174:174 -> b
-    8:8:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> b
-    8:8:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> b
-    8:8:void com.android.tools.r8.graph.MethodCollection.resetCaches():39 -> b
-    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):195 -> b
-    9:9:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):196:196 -> b
-    10:10:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> b
-    10:10:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> b
-    10:10:void com.android.tools.r8.graph.MethodCollection.resetCaches():39 -> b
-    10:10:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):255 -> b
-    11:11:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):256:256 -> b
-    12:12:void replaceAllVirtualMethods(java.util.function.Function):243:243 -> b
-    13:15:void addVirtualMethods(java.util.Collection):296:298 -> b
-    16:16:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):307:307 -> b
-    17:17:boolean com.android.tools.r8.graph.MethodCollection.verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):354:354 -> b
-    17:17:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):307 -> b
-    18:18:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):309:309 -> b
-    19:19:void virtualizeMethods(java.util.Set):314:314 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):153:153 -> b
+    6:6:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):174:174 -> b
+    7:7:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> b
+    7:7:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> b
+    7:7:void com.android.tools.r8.graph.MethodCollection.resetCaches():39 -> b
+    7:7:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):195 -> b
+    8:8:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):196:196 -> b
+    9:9:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> b
+    9:9:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> b
+    9:9:void clearDirectMethods():266 -> b
+    10:10:void clearDirectMethods():267:267 -> b
+    11:11:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> b
+    11:11:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> b
+    11:11:void com.android.tools.r8.graph.MethodCollection.resetCaches():39 -> b
+    11:11:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):255 -> b
+    12:12:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):256:256 -> b
+    13:13:void replaceAllVirtualMethods(java.util.function.Function):243:243 -> b
+    14:16:void addVirtualMethods(java.util.Collection):300:302 -> b
+    17:17:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):311:311 -> b
+    18:18:boolean com.android.tools.r8.graph.MethodCollection.verifyCorrectnessOfMethodHolders(com.android.tools.r8.graph.DexEncodedMethod[]):358:358 -> b
+    18:18:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):311 -> b
+    19:19:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):313:313 -> b
+    20:20:void virtualizeMethods(java.util.Set):318:318 -> b
     1:1:boolean hasDirectMethods(java.util.function.Predicate):60:60 -> c
     2:2:void forEachVirtualMethodMatching(java.util.function.Predicate,java.util.function.Consumer):121:121 -> c
     3:4:void lambda$forEachVirtualMethodMatching$2(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):123:124 -> c
@@ -22373,212 +22491,225 @@
     6:6:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> c
     6:6:void replaceDirectMethods(java.util.function.Function):227 -> c
     7:7:void replaceDirectMethods(java.util.function.Function):228:228 -> c
-    8:9:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():182:183 -> c
-    10:10:java.lang.Iterable com.android.tools.r8.graph.MethodCollection.directMethods():145:145 -> c
-    10:10:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():184 -> c
-    11:18:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():184:191 -> c
-    19:19:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):201:201 -> c
-    1:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(java.util.function.Predicate):157:158 -> d
-    1:2:boolean hasMethods(java.util.function.Predicate):52 -> d
-    3:3:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> d
-    3:3:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> d
-    3:3:void com.android.tools.r8.graph.MethodCollection.resetCaches():39 -> d
-    3:3:void replaceMethods(java.util.function.Function):222 -> d
-    4:4:void replaceMethods(java.util.function.Function):223:223 -> d
-    5:7:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):271:273 -> d
-    8:8:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> d
-    8:8:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> d
-    8:8:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):274 -> d
-    9:9:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):276:276 -> d
-    10:10:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> d
-    10:10:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):276 -> d
-    11:11:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):276:276 -> d
-    12:12:boolean hasAnnotations():318:318 -> d
-    13:13:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.MethodCollection.traverse(java.util.function.Function):84:84 -> d
-    13:13:boolean hasAnnotations():318 -> d
-    14:14:boolean hasAnnotations():323:323 -> d
-    15:17:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$4(com.android.tools.r8.graph.DexEncodedMethod):320:322 -> d
-    1:1:boolean hasDirectMethods():56:56 -> e
-    2:2:boolean com.android.tools.r8.graph.MethodCollection.hasDirectMethods(java.util.function.Predicate):60:60 -> e
-    2:2:boolean hasDirectMethods():56 -> e
-    3:3:boolean hasVirtualMethods(java.util.function.Predicate):68:68 -> e
-    4:4:void replaceVirtualMethods(java.util.function.Function):233:233 -> e
-    5:5:void lambda$verify$5(com.android.tools.r8.graph.DexEncodedMethod):334:334 -> e
-    1:1:boolean hasVirtualMethods():64:64 -> f
-    2:2:boolean com.android.tools.r8.graph.MethodCollection.hasVirtualMethods(java.util.function.Predicate):68:68 -> f
-    2:2:boolean hasVirtualMethods():64 -> f
-    3:3:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):84:84 -> f
-    4:4:java.lang.Iterable com.android.tools.r8.graph.MethodCollection.methods():130:130 -> f
-    4:4:java.lang.Iterable methods(java.util.function.Predicate):134 -> f
-    5:5:java.lang.Iterable methods(java.util.function.Predicate):134:134 -> f
-    6:10:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):341:345 -> f
-    1:1:java.lang.Iterable methods():130:130 -> g
-    1:1:int numberOfDirectMethods():72:72 -> h
-    1:1:int numberOfVirtualMethods():76:76 -> i
-    1:1:int size():80:80 -> j
-    1:1:void useSortedBacking():327:327 -> k
-    2:2:int com.android.tools.r8.graph.MethodCollection.size():80:80 -> k
-    2:2:void useSortedBacking():327 -> k
-    3:4:void useSortedBacking():327:328 -> k
-    1:1:boolean verify():332:332 -> l
-    2:2:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> l
-    2:2:boolean verify():332 -> l
-    3:3:boolean verify():336:336 -> l
-    1:1:java.lang.Iterable virtualMethods():149:149 -> m
-com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.internal.xo:
+    8:8:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):201:201 -> c
+    9:9:void clearVirtualMethods():307:307 -> c
+    1:1:java.lang.Iterable directMethods():145:145 -> d
+    2:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodCollection.getMethod(java.util.function.Predicate):157:158 -> d
+    2:3:boolean hasMethods(java.util.function.Predicate):52 -> d
+    4:4:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> d
+    4:4:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> d
+    4:4:void com.android.tools.r8.graph.MethodCollection.resetCaches():39 -> d
+    4:4:void replaceMethods(java.util.function.Function):222 -> d
+    5:5:void replaceMethods(java.util.function.Function):223:223 -> d
+    6:8:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):271:273 -> d
+    9:31:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):0:22 -> d
+    9:31:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):273 -> d
+    32:32:void com.android.tools.r8.graph.MethodCollection.resetClassInitializerCache():178:178 -> d
+    32:32:void com.android.tools.r8.graph.MethodCollection.resetDirectMethodCaches():44 -> d
+    32:32:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):274 -> d
+    33:33:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):276:276 -> d
+    34:36:com.android.tools.r8.utils.TraversalContinuation lambda$hasAnnotations$4(com.android.tools.r8.graph.DexEncodedMethod):324:326 -> d
+    1:1:boolean hasVirtualMethods(java.util.function.Predicate):68:68 -> e
+    2:3:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():182:183 -> e
+    4:4:java.lang.Iterable com.android.tools.r8.graph.MethodCollection.directMethods():145:145 -> e
+    4:4:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():184 -> e
+    5:12:com.android.tools.r8.graph.DexEncodedMethod getClassInitializer():184:191 -> e
+    13:13:void replaceVirtualMethods(java.util.function.Function):233:233 -> e
+    14:14:void lambda$verify$5(com.android.tools.r8.graph.DexEncodedMethod):338:338 -> e
+    1:1:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):84:84 -> f
+    2:2:java.lang.Iterable com.android.tools.r8.graph.MethodCollection.methods():130:130 -> f
+    2:2:java.lang.Iterable methods(java.util.function.Predicate):134 -> f
+    3:3:java.lang.Iterable methods(java.util.function.Predicate):134:134 -> f
+    4:4:boolean hasAnnotations():322:322 -> f
+    5:5:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.MethodCollection.traverse(java.util.function.Function):84:84 -> f
+    5:5:boolean hasAnnotations():322 -> f
+    6:6:boolean hasAnnotations():327:327 -> f
+    7:11:boolean verifyCorrectnessOfMethodHolder(com.android.tools.r8.graph.DexEncodedMethod):345:349 -> f
+    1:1:boolean hasDirectMethods():56:56 -> g
+    2:2:boolean com.android.tools.r8.graph.MethodCollection.hasDirectMethods(java.util.function.Predicate):60:60 -> g
+    2:2:boolean hasDirectMethods():56 -> g
+    1:1:boolean hasVirtualMethods():64:64 -> h
+    2:2:boolean com.android.tools.r8.graph.MethodCollection.hasVirtualMethods(java.util.function.Predicate):68:68 -> h
+    2:2:boolean hasVirtualMethods():64 -> h
+    1:1:java.lang.Iterable methods():130:130 -> i
+    1:1:int numberOfDirectMethods():72:72 -> j
+    1:1:int numberOfVirtualMethods():76:76 -> k
+    1:1:int size():80:80 -> l
+    1:1:void useSortedBacking():331:331 -> m
+    2:2:int com.android.tools.r8.graph.MethodCollection.size():80:80 -> m
+    2:2:void useSortedBacking():331 -> m
+    3:4:void useSortedBacking():331:332 -> m
+    1:1:boolean verify():336:336 -> n
+    2:2:void com.android.tools.r8.graph.MethodCollection.forEachMethod(java.util.function.Consumer):88:88 -> n
+    2:2:boolean verify():336 -> n
+    3:3:boolean verify():340:340 -> n
+    1:1:java.lang.Iterable virtualMethods():149:149 -> o
+com.android.tools.r8.graph.MethodCollectionBacking -> com.android.tools.r8.internal.Jo:
     1:1:void <init>():15:15 -> <init>
     void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod) -> a
     void addDirectMethods(java.util.Collection) -> a
-    java.lang.Iterable directMethods() -> a
+    void clearDirectMethods() -> a
     com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod) -> a
     com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate) -> a
     void removeMethods(java.util.Set) -> a
     void replaceAllDirectMethods(java.util.function.Function) -> a
     com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function) -> a
     void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]) -> a
-    1:1:void forEachMethod(java.util.function.Consumer,java.util.function.Predicate):48:48 -> a
-    2:5:com.android.tools.r8.utils.TraversalContinuation lambda$forEachMethod$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):50:53 -> a
-    6:6:void forEachDirectMethod(java.util.function.Consumer):58:58 -> a
+    1:1:void forEachMethod(java.util.function.Consumer,java.util.function.Predicate):46:46 -> a
+    2:5:com.android.tools.r8.utils.TraversalContinuation lambda$forEachMethod$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexEncodedMethod):48:51 -> a
+    6:6:void forEachDirectMethod(java.util.function.Consumer):56:56 -> a
     void addMethod(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void addVirtualMethods(java.util.Collection) -> b
+    void clearVirtualMethods() -> b
     com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod) -> b
     com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate) -> b
-    java.lang.Iterable methods() -> b
     void replaceAllVirtualMethods(java.util.function.Function) -> b
     com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function) -> b
     void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]) -> b
     void virtualizeMethods(java.util.Set) -> b
-    1:1:void forEachVirtualMethod(java.util.function.Consumer):62:62 -> b
+    1:1:void forEachVirtualMethod(java.util.function.Consumer):60:60 -> b
     void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod) -> c
+    java.lang.Iterable directMethods() -> c
     com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod) -> c
-    int numberOfDirectMethods() -> c
     void replaceDirectMethods(java.util.function.Function) -> c
-    int numberOfVirtualMethods() -> d
+    java.lang.Iterable methods() -> d
     com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod) -> d
     void replaceMethods(java.util.function.Function) -> d
-    1:3:boolean belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:24 -> d
+    1:1:boolean belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> d
+    int numberOfDirectMethods() -> e
     void replaceVirtualMethods(java.util.function.Function) -> e
-    int size() -> e
-    1:1:boolean belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> e
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToVirtualPool():607:607 -> e
+    1:1:boolean belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):26 -> e
+    int numberOfVirtualMethods() -> f
     com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function) -> f
-    boolean verify() -> f
-    java.lang.Iterable virtualMethods() -> g
-com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.Bo:
+    int size() -> g
+    boolean verify() -> h
+    java.lang.Iterable virtualMethods() -> i
+com.android.tools.r8.graph.MethodMapBacking -> com.android.tools.r8.internal.No:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap methodMap -> b
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>():29:29 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap):32:33 -> <init>
-    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-    1:1:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):231 -> a
-    2:2:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232:232 -> a
-    3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
-    3:3:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232 -> a
-    4:4:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232:232 -> a
-    5:5:int lambda$createSorted$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):37:37 -> a
-    6:6:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
-    7:219:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> a
-    7:219:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68 -> a
-    220:220:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
-    221:221:java.lang.Iterable directMethods():116:116 -> a
-    222:222:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
-    222:222:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
-    223:223:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
-    223:223:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126 -> a
+    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$8(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282 -> a
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$8(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
+    3:3:int lambda$createSorted$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):37:37 -> a
+    4:4:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
+    5:221:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> a
+    5:221:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68 -> a
+    222:222:void lambda$verify$1(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):68:68 -> a
+    223:223:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
     223:223:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
-    224:224:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
+    224:224:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
+    224:224:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126 -> a
     224:224:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
-    225:225:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):145:145 -> a
-    226:230:com.android.tools.r8.utils.TraversalContinuation lambda$getMethod$4(java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexEncodedMethod):133:137 -> a
-    231:232:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):150:151 -> a
-    233:234:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
-    235:235:void addDirectMethods(java.util.Collection):187:187 -> a
-    236:237:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
-    236:237:void addDirectMethods(java.util.Collection):188 -> a
-    238:238:void removeMethods(java.util.Set):216:216 -> a
-    239:243:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):221:225 -> a
-    244:244:int com.android.tools.r8.graph.MethodMapBacking.size():95:95 -> a
-    244:244:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
-    245:245:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228:228 -> a
-    246:246:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48:48 -> a
-    246:246:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
-    247:247:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> a
-    247:247:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48 -> a
-    247:247:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
-    248:248:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):229:229 -> a
-    249:249:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> a
-    249:249:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):229 -> a
-    250:252:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):235:237 -> a
-    253:253:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
-    253:253:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237 -> a
-    254:256:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237:239 -> a
-    257:257:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceDirectMethods$8(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    258:264:void replaceAllDirectMethods(java.util.function.Function):292:298 -> a
-    265:265:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315:315 -> a
-    266:266:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
-    266:266:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,java.util.function.Predicate):328 -> a
-    266:266:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315 -> a
-    267:273:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,java.util.function.Predicate):329:335 -> a
-    267:273:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315 -> a
-    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$9(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):287 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$9(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):287:287 -> b
+    225:225:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> a
+    225:225:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):144 -> a
+    226:226:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    226:226:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(com.android.tools.r8.graph.DexMethod):145 -> a
+    227:231:com.android.tools.r8.utils.TraversalContinuation lambda$getMethod$4(java.util.function.Predicate,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexEncodedMethod):133:137 -> a
+    232:233:com.android.tools.r8.graph.DexEncodedMethod getDirectMethod(java.util.function.Predicate):150:151 -> a
+    234:234:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> a
+    235:235:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    235:235:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    236:237:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
+    238:238:void addDirectMethods(java.util.Collection):187:187 -> a
+    239:239:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> a
+    239:239:void addDirectMethods(java.util.Collection):188 -> a
+    240:240:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    240:240:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175 -> a
+    240:240:void addDirectMethods(java.util.Collection):188 -> a
+    241:242:void com.android.tools.r8.graph.MethodMapBacking.addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):175:176 -> a
+    241:242:void addDirectMethods(java.util.Collection):188 -> a
+    243:243:void clearDirectMethods():201:201 -> a
+    244:244:void removeMethods(java.util.Set):216:216 -> a
+    245:249:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):221:225 -> a
+    250:250:int com.android.tools.r8.graph.MethodMapBacking.size():95:95 -> a
+    250:250:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
+    251:251:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228:228 -> a
+    252:252:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48:48 -> a
+    252:252:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
+    253:253:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> a
+    253:253:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48 -> a
+    253:253:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):228 -> a
+    254:254:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):229:229 -> a
+    255:255:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> a
+    255:255:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):229 -> a
+    256:257:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):235:236 -> a
+    258:258:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> a
+    258:258:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):236 -> a
+    259:260:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):236:237 -> a
+    261:261:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
+    261:261:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237 -> a
+    262:264:void setDirectMethods(com.android.tools.r8.graph.DexEncodedMethod[]):237:239 -> a
+    265:266:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):231:232 -> a
+    267:267:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
+    267:267:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232 -> a
+    268:268:void lambda$setDirectMethods$6(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):232:232 -> a
+    269:275:void replaceAllDirectMethods(java.util.function.Function):292:298 -> a
+    276:276:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315:315 -> a
+    277:277:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> a
+    277:277:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,java.util.function.Predicate):328 -> a
+    277:277:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315 -> a
+    278:284:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.replaceMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function,java.util.function.Predicate):329:335 -> a
+    278:284:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):315 -> a
+    1:1:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToDirectPool(com.android.tools.r8.graph.DexEncodedMethod):22:22 -> b
+    1:1:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):254 -> b
+    2:2:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> b
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):342 -> b
-    4:4:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):343:343 -> b
-    5:5:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> b
-    5:5:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):344 -> b
-    6:8:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):347:349 -> b
-    9:9:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):56:56 -> b
-    10:222:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> b
-    10:222:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):56 -> b
-    223:226:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):57:60 -> b
-    227:227:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
-    227:227:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):60 -> b
-    228:228:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):60:60 -> b
-    229:229:java.lang.Iterable methods():111:111 -> b
-    230:230:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> b
-    231:231:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
-    231:231:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):126 -> b
-    232:232:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> b
-    233:234:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):162:163 -> b
-    235:235:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):168:168 -> b
-    236:236:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
-    236:236:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):168 -> b
-    237:238:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):169:170 -> b
-    239:240:void addVirtualMethods(java.util.Collection):194:195 -> b
-    241:245:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):244:248 -> b
-    246:246:int com.android.tools.r8.graph.MethodMapBacking.size():95:95 -> b
-    246:246:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
-    247:247:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251:251 -> b
-    248:248:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48:48 -> b
-    248:248:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
-    249:249:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> b
-    249:249:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48 -> b
-    249:249:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
-    250:250:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252:252 -> b
-    251:251:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):44:44 -> b
-    251:251:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252 -> b
-    252:254:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):258:260 -> b
-    255:255:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
-    255:255:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260 -> b
-    256:258:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260:262 -> b
-    259:260:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):254:255 -> b
-    261:261:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
-    261:261:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255 -> b
-    262:262:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> b
-    263:267:void replaceAllVirtualMethods(java.util.function.Function):303:307 -> b
-    268:269:void com.android.tools.r8.graph.MethodMapBacking.addVirtualMethods(java.util.Collection):194:195 -> b
-    268:269:void replaceAllVirtualMethods(java.util.function.Function):309 -> b
-    270:270:void virtualizeMethods(java.util.Set):356:356 -> b
-    271:273:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):360:362 -> b
-    271:273:void virtualizeMethods(java.util.Set):356 -> b
-    274:274:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
-    274:274:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362 -> b
-    274:274:void virtualizeMethods(java.util.Set):356 -> b
-    275:275:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362:362 -> b
-    275:275:void virtualizeMethods(java.util.Set):356 -> b
-    1:1:int numberOfDirectMethods():75:75 -> c
+    3:3:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255 -> b
+    4:4:void lambda$setVirtualMethods$7(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap,com.android.tools.r8.graph.DexEncodedMethod):255:255 -> b
+    5:5:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
+    5:5:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):342 -> b
+    6:12:com.android.tools.r8.graph.DexEncodedMethod replaceDirectMethodWithVirtualMethod(com.android.tools.r8.graph.DexMethod,java.util.function.Function):343:349 -> b
+    13:13:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):56:56 -> b
+    14:230:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> b
+    14:230:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):56 -> b
+    231:234:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):57:60 -> b
+    235:235:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
+    235:235:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):60 -> b
+    236:236:void replace(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.graph.DexEncodedMethod):60:60 -> b
+    237:237:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> b
+    238:238:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
+    238:238:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):126 -> b
+    239:239:com.android.tools.r8.graph.DexEncodedMethod getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> b
+    240:241:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(java.util.function.Predicate):162:163 -> b
+    242:242:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):168:168 -> b
+    243:243:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
+    243:243:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):168 -> b
+    244:245:void addMethod(com.android.tools.r8.graph.DexEncodedMethod):169:170 -> b
+    246:246:void addVirtualMethods(java.util.Collection):194:194 -> b
+    247:248:void com.android.tools.r8.graph.MethodMapBacking.addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):181:182 -> b
+    247:248:void addVirtualMethods(java.util.Collection):195 -> b
+    249:249:void clearVirtualMethods():206:206 -> b
+    250:254:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):244:248 -> b
+    255:255:int com.android.tools.r8.graph.MethodMapBacking.size():95:95 -> b
+    255:255:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
+    256:256:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251:251 -> b
+    257:257:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48:48 -> b
+    257:257:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
+    258:258:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>(int):165:165 -> b
+    258:258:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap com.android.tools.r8.graph.MethodMapBacking.createMap(int):48 -> b
+    258:258:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):251 -> b
+    259:259:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252:252 -> b
+    260:260:void com.android.tools.r8.graph.MethodCollectionBacking.forEachMethod(java.util.function.Consumer):42:42 -> b
+    260:260:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):252 -> b
+    261:263:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):258:260 -> b
+    264:264:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
+    264:264:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260 -> b
+    265:267:void setVirtualMethods(com.android.tools.r8.graph.DexEncodedMethod[]):260:262 -> b
+    268:268:com.android.tools.r8.graph.DexEncodedMethod lambda$replaceVirtualMethods$9(java.util.function.Function,com.android.tools.r8.graph.DexEncodedMethod):287:287 -> b
+    269:275:void replaceAllVirtualMethods(java.util.function.Function):303:309 -> b
+    276:276:void virtualizeMethods(java.util.Set):356:356 -> b
+    277:279:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):360:362 -> b
+    277:279:void virtualizeMethods(java.util.Set):356 -> b
+    280:280:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> b
+    280:280:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362 -> b
+    280:280:void virtualizeMethods(java.util.Set):356 -> b
+    281:281:boolean com.android.tools.r8.graph.MethodMapBacking.verifyVirtualizedMethods(java.util.Set):362:362 -> b
+    281:281:void virtualizeMethods(java.util.Set):356 -> b
+    1:1:java.lang.Iterable directMethods():116:116 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> c
     2:2:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):156 -> c
     3:3:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> c
@@ -22586,16 +22717,12 @@
     3:3:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):156 -> c
     4:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.getMethod(com.android.tools.r8.graph.DexMethod):126:126 -> c
     4:4:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):156 -> c
-    5:5:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> c
-    5:5:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):157 -> c
+    5:5:com.android.tools.r8.graph.DexEncodedMethod getVirtualMethod(com.android.tools.r8.graph.DexMethod):157:157 -> c
     6:15:com.android.tools.r8.graph.DexEncodedMethod getMethod(java.util.function.Predicate):130:139 -> c
-    16:16:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):181:181 -> c
-    17:17:boolean com.android.tools.r8.graph.MethodCollectionBacking.belongsToVirtualPool(com.android.tools.r8.graph.DexEncodedMethod):28:28 -> c
-    17:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):181 -> c
-    18:19:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):181:182 -> c
-    20:20:void replaceDirectMethods(java.util.function.Function):282:282 -> c
-    1:1:int numberOfVirtualMethods():80:80 -> d
-    2:3:int numberOfMethodsMatching(java.util.function.Predicate):85:86 -> d
+    16:17:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):181:182 -> c
+    18:18:void replaceDirectMethods(java.util.function.Function):282:282 -> c
+    1:2:int numberOfMethodsMatching(java.util.function.Predicate):85:86 -> d
+    3:3:java.lang.Iterable methods():111:111 -> d
     4:4:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):211:211 -> d
     5:5:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> d
     5:5:com.android.tools.r8.graph.DexEncodedMethod removeMethod(com.android.tools.r8.graph.DexMethod):211 -> d
@@ -22609,24 +22736,24 @@
     14:14:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.MethodMapBacking.removeMethod(com.android.tools.r8.graph.DexMethod):211:211 -> d
     14:14:void replaceMethods(java.util.function.Function):274 -> d
     15:15:void replaceMethods(java.util.function.Function):275:275 -> d
-    1:1:int size():95:95 -> e
+    1:1:int numberOfDirectMethods():75:75 -> e
     2:2:void replaceVirtualMethods(java.util.function.Function):287:287 -> e
-    1:1:boolean verify():66:66 -> f
+    1:1:int numberOfVirtualMethods():80:80 -> f
     2:8:com.android.tools.r8.utils.TraversalContinuation traverse(java.util.function.Function):100:106 -> f
     9:9:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> f
     10:10:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper com.android.tools.r8.graph.MethodMapBacking.wrap(com.android.tools.r8.graph.DexMethod):52:52 -> f
     10:10:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216 -> f
     11:11:void lambda$removeMethods$5(com.android.tools.r8.graph.DexEncodedMethod):216:216 -> f
-    1:1:java.lang.Iterable virtualMethods():121:121 -> g
-    1:1:void clearDirectMethods():201:201 -> h
-    1:1:void clearVirtualMethods():206:206 -> i
+    1:1:int size():95:95 -> g
+    1:1:boolean verify():66:66 -> h
+    1:1:java.lang.Iterable virtualMethods():121:121 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap():43:43 -> j
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.<init>():174:174 -> j
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap createMap():43 -> j
     1:2:com.android.tools.r8.graph.MethodMapBacking createSorted():37:38 -> k
     1:1:java.util.Iterator lambda$directMethods$2():116:116 -> l
     1:1:java.util.Iterator lambda$virtualMethods$3():121:121 -> m
-com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.Bp:
+com.android.tools.r8.graph.NestHostClassAttribute -> com.android.tools.r8.internal.Np:
     com.android.tools.r8.graph.DexType nestHost -> c
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -22634,7 +22761,7 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType):14:15 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestHost():19:19 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):27:28 -> a
-com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.Cp:
+com.android.tools.r8.graph.NestMemberClassAttribute -> com.android.tools.r8.internal.Op:
     com.android.tools.r8.graph.DexType nestMember -> c
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -22642,8 +22769,8 @@
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
     1:1:com.android.tools.r8.graph.DexType getNestMember():25:25 -> a
     2:3:void write(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.naming.NamingLens):29:30 -> a
-com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.cr:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.fr:
+com.android.tools.r8.graph.ObjectAllocationInfoCollection -> com.android.tools.r8.internal.or:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl -> com.android.tools.r8.internal.rr:
     java.util.Map classesWithAllocationSiteTracking -> b
     java.util.Set classesWithoutAllocationSiteTracking -> c
     java.util.Set interfacesWithUnknownSubtypeHierarchy -> d
@@ -22671,8 +22798,8 @@
     1:1:boolean isImmediateInterfaceOfInstantiatedLambda(com.android.tools.r8.graph.DexProgramClass):117:117 -> b
     1:8:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):78:85 -> c
     1:1:boolean isInterfaceWithUnknownSubtypeHierarchy(com.android.tools.r8.graph.DexProgramClass):111:111 -> d
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.dr:
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.fr$a:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1 -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder -> com.android.tools.r8.internal.rr$a:
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data data -> h
     boolean $assertionsDisabled -> g
     1:1:void <clinit>():218:218 -> <clinit>
@@ -22685,7 +22812,7 @@
     14:26:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):288 -> a
     27:36:boolean recordDirectAllocationSite(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.AppInfo):289:298 -> a
     37:37:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):305:305 -> a
-    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
+    38:38:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
     38:38:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):306 -> a
     39:41:boolean recordInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfo):306:308 -> a
     42:42:void recordInstantiatedLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfo):316:316 -> a
@@ -22730,14 +22857,14 @@
     1:1:java.util.Set lambda$recordDirectAllocationSite$0(com.android.tools.r8.graph.DexProgramClass):292:292 -> e
     1:1:java.util.Set lambda$rewrittenWithLens$7(com.android.tools.r8.graph.DexProgramClass):404:404 -> f
     1:3:void markNoLongerInstantiated(com.android.tools.r8.graph.DexProgramClass):368:370 -> g
-com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.er:
+com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data -> com.android.tools.r8.internal.qr:
     com.android.tools.r8.shaking.GraphReporter reporter -> b
     boolean trackAllocationSites -> a
     1:1:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$1):220:220 -> <init>
     2:4:void <init>(boolean,com.android.tools.r8.shaking.GraphReporter):225:227 -> <init>
     1:1:boolean access$300(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):220:220 -> a
     1:1:com.android.tools.r8.shaking.GraphReporter access$400(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder$Data):220:220 -> b
-com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.Dr:
+com.android.tools.r8.graph.ObjectToOffsetMapping -> com.android.tools.r8.internal.Pr:
     com.android.tools.r8.ir.conversion.LensCodeRewriterUtils lensCodeRewriter -> e
     com.android.tools.r8.graph.InitClassLens initClassLens -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap callSites -> l
@@ -22791,7 +22918,7 @@
     1:1:java.util.Collection getStrings():215:215 -> l
     1:1:java.util.Collection getTypes():203:203 -> m
     1:1:boolean hasJumboStrings():227:227 -> n
-com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.Dr$a:
+com.android.tools.r8.graph.ObjectToOffsetMapping$ProgramClassDepthsMemoized -> com.android.tools.r8.internal.Pr$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap depthOfClasses -> b
     com.android.tools.r8.graph.AppInfo appInfo -> a
     1:1:void <init>(com.android.tools.r8.graph.AppInfo):127:127 -> <init>
@@ -22803,7 +22930,7 @@
     19:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     19:19:int getDepth(com.android.tools.r8.graph.DexProgramClass):150 -> a
     20:23:int getDepth(com.android.tools.r8.graph.DexProgramClass):151:154 -> a
-com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.Hr:
+com.android.tools.r8.graph.OffsetToObjectMapping -> com.android.tools.r8.internal.Tr:
     com.android.tools.r8.graph.DexProto[] protos -> d
     com.android.tools.r8.graph.DexMethod[] methods -> c
     com.android.tools.r8.graph.DexMethodHandle[] methodHandles -> i
@@ -22865,13 +22992,13 @@
     1:1:int countNonMissing():124:124 -> p
     1:1:com.android.tools.r8.graph.ParameterAnnotationsList empty():47:47 -> q
     1:1:int size():116:116 -> size
-com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.xs:
+com.android.tools.r8.graph.PinnedPredicate -> com.android.tools.r8.internal.Js:
     boolean isPinned(com.android.tools.r8.graph.DexDefinition) -> a
-com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.internal.Vs:
+com.android.tools.r8.graph.PresortedComparable -> com.android.tools.r8.internal.ht:
     int slowCompareTo(java.lang.Object) -> a
     int slowCompareTo(java.lang.Object,com.android.tools.r8.naming.NamingLens) -> a
     1:1:int slowCompare(com.android.tools.r8.graph.PresortedComparable,com.android.tools.r8.graph.PresortedComparable):14:14 -> a
-com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.dt:
+com.android.tools.r8.graph.ProgramClassVisitor -> com.android.tools.r8.internal.yt:
     com.android.tools.r8.graph.DexApplication application -> a
     java.util.Set visited -> b
     1:1:void <init>(com.android.tools.r8.graph.DexApplication):32:32 -> <init>
@@ -22883,7 +23010,7 @@
     18:19:void accept(com.android.tools.r8.graph.DexClass):61:62 -> a
     20:21:void run(com.android.tools.r8.graph.DexProgramClass[]):66:67 -> a
     void visit(com.android.tools.r8.graph.DexClass) -> b
-com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.et:
+com.android.tools.r8.graph.ProgramDefinition -> com.android.tools.r8.internal.zt:
     com.android.tools.r8.graph.DexProgramClass getContextClass() -> a
     com.android.tools.r8.graph.DexDefinition getDefinition() -> b
     boolean isProgramMethod() -> c
@@ -22893,7 +23020,7 @@
     com.android.tools.r8.graph.DexType getContextType() -> k
     boolean isProgramField() -> n
     com.android.tools.r8.graph.ProgramField asProgramField() -> o
-com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.ft:
+com.android.tools.r8.graph.ProgramDexCode -> com.android.tools.r8.internal.At:
     com.android.tools.r8.graph.ProgramMethod method -> b
     com.android.tools.r8.graph.DexCode code -> a
     1:3:void <init>(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.ProgramMethod):12:14 -> <init>
@@ -22907,7 +23034,7 @@
     1:3:com.android.tools.r8.graph.DexProgramClass getHolder():41:43 -> j
     com.android.tools.r8.graph.ProgramField asProgramField() -> o
     1:1:com.android.tools.r8.graph.DexClass getHolder():9:9 -> p
-com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.ht:
+com.android.tools.r8.graph.ProgramMember -> com.android.tools.r8.internal.Ct:
     1:1:com.android.tools.r8.graph.DexProgramClass getContextClass():12:12 -> a
     com.android.tools.r8.graph.DexEncodedMember getDefinition() -> b
     com.android.tools.r8.graph.DexType getHolderType() -> d
@@ -22926,7 +23053,7 @@
     com.android.tools.r8.graph.ProgramMethod asProgramMethod() -> i
     1:3:com.android.tools.r8.graph.DexProgramClass getHolder():81:83 -> j
     1:1:com.android.tools.r8.graph.DexClass getHolder():17:17 -> p
-com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.graph.ProgramPackage -> com.android.tools.r8.internal.Gt:
     java.util.Set classes -> c
     boolean $assertionsDisabled -> a
     java.lang.String packageDescriptor -> b
@@ -22943,7 +23070,7 @@
     8:8:void lambda$forEachMethod$1(java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):59:59 -> b
     1:1:java.lang.String getPackageDescriptor():47:47 -> c
     1:1:java.util.Iterator iterator():68:68 -> iterator
-com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.mt:
+com.android.tools.r8.graph.ProgramPackageCollection -> com.android.tools.r8.internal.Ht:
     java.util.Map packages -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:2:void <init>(java.util.Map):15:16 -> <init>
@@ -23046,12 +23173,12 @@
     11:11:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):143:143 -> <init>
     boolean lambda$lookupInvokeSuperTarget$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass) -> a
     1:1:com.android.tools.r8.graph.DexClassAndMember getResolutionPair():126:126 -> a
-    1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):43 -> a
+    1:1:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42 -> a
     1:1:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):201 -> a
     2:2:com.android.tools.r8.graph.DexClass getInitialResolutionHolder():149:149 -> a
-    2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):44 -> a
+    2:2:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):43 -> a
     2:2:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):201 -> a
-    3:3:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42:42 -> a
+    3:3:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):41:41 -> a
     3:3:com.android.tools.r8.utils.OptionalBool isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):201 -> a
     4:4:com.android.tools.r8.graph.DexClass getInitialResolutionHolder():149:149 -> a
     5:5:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():163:163 -> a
@@ -23060,7 +23187,7 @@
     27:27:com.android.tools.r8.graph.DexEncodedMethod getResolvedMethod():163:163 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):344 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):344:344 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> a
     29:29:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):348 -> a
     30:56:com.android.tools.r8.graph.DexEncodedMethod internalInvokeSpecialOrSuper(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.BiPredicate):352:378 -> a
     57:61:com.android.tools.r8.graph.DexEncodedMethod lookupInvokeDirectTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):299:303 -> a
@@ -23090,38 +23217,38 @@
     212:214:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):558:560 -> a
     215:215:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):566:566 -> a
     216:216:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):572:572 -> a
-    217:429:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> a
-    217:429:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):572 -> a
-    430:430:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):573:573 -> a
-    431:520:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    431:520:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):574 -> a
-    521:521:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):576:576 -> a
-    522:522:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):451:451 -> a
-    522:522:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):579 -> a
-    523:523:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):584:584 -> a
-    524:524:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):636:636 -> a
-    524:524:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):586 -> a
-    525:537:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):591:603 -> a
-    538:538:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):647:647 -> a
-    538:538:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
-    539:539:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
-    539:539:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):647 -> a
-    539:539:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
-    540:542:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):648:650 -> a
-    540:542:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
-    543:544:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):606:607 -> a
-    545:551:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):658:664 -> a
-    545:551:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
-    552:552:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):432:432 -> a
-    552:552:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):664 -> a
-    552:552:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
-    553:555:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):666:668 -> a
-    553:555:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
-    556:556:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):619:619 -> a
-    557:567:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):613:623 -> a
-    568:568:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):631:631 -> a
-    568:568:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):626 -> a
-    569:576:boolean isOverriding(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):685:692 -> a
+    217:433:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> a
+    217:433:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):572 -> a
+    434:434:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):573:573 -> a
+    435:524:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    435:524:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):574 -> a
+    525:525:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):576:576 -> a
+    526:526:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupMethod(com.android.tools.r8.graph.DexMethod):465:465 -> a
+    526:526:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):579 -> a
+    527:527:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):584:584 -> a
+    528:528:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):636:636 -> a
+    528:528:com.android.tools.r8.graph.LookupTarget lookupVirtualDispatchTarget(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.AppInfoWithClassHierarchy):586 -> a
+    529:541:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):591:603 -> a
+    542:542:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):647:647 -> a
+    542:542:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
+    543:543:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):446:446 -> a
+    543:543:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):647 -> a
+    543:543:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
+    544:546:com.android.tools.r8.graph.DexEncodedMethod lookupOverrideCandidate(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):648:650 -> a
+    544:546:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):605 -> a
+    547:548:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):606:607 -> a
+    549:555:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):658:664 -> a
+    549:555:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
+    556:556:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.lookupVirtualMethod(com.android.tools.r8.graph.DexMethod):446:446 -> a
+    556:556:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):664 -> a
+    556:556:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
+    557:559:com.android.tools.r8.graph.DexEncodedMethod findWideningOverride(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):666:668 -> a
+    557:559:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):607 -> a
+    560:560:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):619:619 -> a
+    561:571:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):613:623 -> a
+    572:572:com.android.tools.r8.graph.DexClassAndMethod lookupMaximallySpecificDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy):631:631 -> a
+    572:572:com.android.tools.r8.graph.DexClassAndMethod lookupVirtualDispatchTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexType):626 -> a
+    573:580:boolean isOverriding(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):685:692 -> a
     1:1:com.android.tools.r8.graph.DexEncodedMethod getResolvedMember():159:159 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMember getResolvedMember():126 -> b
     2:5:com.android.tools.r8.utils.OptionalBool isAccessibleForVirtualDispatchFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):207:210 -> b
@@ -23259,7 +23386,7 @@
     com.android.tools.r8.graph.RewrittenPrototypeDescription$RewrittenTypeInfo asRewrittenTypeInfo() -> d
     1:1:com.android.tools.r8.graph.DexType getNewType():146:146 -> e
     1:1:com.android.tools.r8.graph.DexType getOldType():150:150 -> f
-com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.ky:
+com.android.tools.r8.graph.SmaliWriter -> com.android.tools.r8.internal.Dy:
     1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions):21:21 -> <init>
     java.lang.String getFileEnding() -> a
     void writeField(com.android.tools.r8.graph.DexEncodedField,java.io.PrintStream) -> a
@@ -23268,17 +23395,17 @@
     18:20:void writeMethod(com.android.tools.r8.graph.ProgramMethod,java.io.PrintStream):71:73 -> a
     1:3:void writeClassFooter(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):64:66 -> b
     1:13:void writeClassHeader(com.android.tools.r8.graph.DexProgramClass,java.io.PrintStream):45:57 -> c
-com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.sy:
+com.android.tools.r8.graph.SortedProgramPackage -> com.android.tools.r8.internal.Ly:
     1:1:void <init>(java.lang.String):12:12 -> <init>
     1:1:int lambda$new$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):12:12 -> a
     1:1:java.util.Set lambda$new$1():12:12 -> d
-com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.ty:
+com.android.tools.r8.graph.SortedProgramPackageCollection -> com.android.tools.r8.internal.My:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     1:4:com.android.tools.r8.graph.SortedProgramPackageCollection createWithAllProgramClasses(com.android.tools.r8.graph.AppView):16:19 -> a
     5:7:boolean addProgramClass(com.android.tools.r8.graph.DexProgramClass):26:28 -> a
-com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.Cz:
+com.android.tools.r8.graph.SubtypingInfo -> com.android.tools.r8.internal.Vz:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Map typeInfo -> d
     java.util.Set missingClasses -> f
@@ -23322,7 +23449,7 @@
     1:1:boolean lambda$allImmediateImplementsSubtypes$4(com.android.tools.r8.graph.DexType):242:242 -> h
     1:1:java.util.Set lambda$populateSuperType$1(com.android.tools.r8.graph.DexType):76:76 -> i
     1:3:java.util.Set subtypes(com.android.tools.r8.graph.DexType):189:191 -> j
-com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.Cz$a:
+com.android.tools.r8.graph.SubtypingInfo$TypeInfo -> com.android.tools.r8.internal.Vz$a:
     java.util.Set directSubtypes -> d
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
@@ -23340,10 +23467,10 @@
     1:5:boolean equals(java.lang.Object):269:273 -> equals
     1:1:int hashCode():264:264 -> hashCode
     1:1:java.lang.String toString():278:278 -> toString
-com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.Dz:
+com.android.tools.r8.graph.SuccessfulMemberResolutionResult -> com.android.tools.r8.internal.Wz:
     com.android.tools.r8.graph.DexClass getInitialResolutionHolder() -> a
     com.android.tools.r8.graph.DexEncodedMember getResolvedMember() -> b
-com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.FA:
+com.android.tools.r8.graph.TopDownClassHierarchyTraversal -> com.android.tools.r8.internal.YA:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ClassHierarchyTraversal$Scope):14:14 -> <init>
     1:1:com.android.tools.r8.graph.TopDownClassHierarchyTraversal forAllClasses(com.android.tools.r8.graph.AppView):23:23 -> a
     2:2:com.android.tools.r8.graph.ClassHierarchyTraversal com.android.tools.r8.graph.ClassHierarchyTraversal.excludeInterfaces():60:60 -> a
@@ -23363,14 +23490,14 @@
     30:30:boolean com.android.tools.r8.graph.ClassHierarchyTraversal$Scope.shouldBePassedToVisitor(com.android.tools.r8.graph.DexClass):30 -> a
     30:30:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):69 -> a
     31:36:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):72:77 -> a
-    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     37:37:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):77 -> a
     38:47:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
     38:47:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
     48:48:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):101:101 -> a
     48:48:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):78 -> a
     49:56:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):79:86 -> a
-    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    57:57:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     57:57:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):86 -> a
     58:67:boolean com.android.tools.r8.graph.TopDownClassHierarchyTraversal.shouldTraverseUpwardsFrom(com.android.tools.r8.graph.DexClass):95:104 -> a
     58:67:void addDependentsToWorklist(com.android.tools.r8.graph.DexClass):87 -> a
@@ -23381,51 +23508,51 @@
 com.android.tools.r8.graph.UseRegistry -> com.android.tools.r8.graph.N0:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():7:7 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):16:17 -> <init>
+    1:1:void <clinit>():9:9 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):18:19 -> <init>
     void registerInstanceFieldRead(com.android.tools.r8.graph.DexField) -> a
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):49:49 -> a
-    2:2:void registerCheckCast(com.android.tools.r8.graph.DexType):75:75 -> a
-    3:37:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):83:117 -> a
-    38:38:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):114:114 -> a
-    39:39:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):111:111 -> a
-    40:40:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):108:108 -> a
-    41:43:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):103:105 -> a
-    44:44:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):100:100 -> a
-    45:45:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):97:97 -> a
-    46:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):94:94 -> a
-    47:47:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):91:91 -> a
-    48:48:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):88:88 -> a
-    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):85:85 -> a
-    50:85:void registerCallSite(com.android.tools.r8.graph.DexCallSite):122:157 -> a
-    86:86:void registerCallSite(com.android.tools.r8.graph.DexCallSite):153:153 -> a
-    87:87:void registerCallSite(com.android.tools.r8.graph.DexCallSite):150:150 -> a
-    88:96:void registerCallSite(com.android.tools.r8.graph.DexCallSite):139:147 -> a
-    97:99:void registerProto(com.android.tools.r8.graph.DexProto):163:165 -> a
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod,boolean):51:51 -> a
+    2:2:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):74:74 -> a
+    3:3:void registerCheckCast(com.android.tools.r8.graph.DexType):78:78 -> a
+    4:38:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):86:120 -> a
+    39:39:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):117:117 -> a
+    40:40:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):114:114 -> a
+    41:41:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):111:111 -> a
+    42:44:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):106:108 -> a
+    45:45:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):103:103 -> a
+    46:46:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):100:100 -> a
+    47:47:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):97:97 -> a
+    48:48:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):94:94 -> a
+    49:49:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):91:91 -> a
+    50:50:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):88:88 -> a
+    51:86:void registerCallSite(com.android.tools.r8.graph.DexCallSite):125:160 -> a
+    87:87:void registerCallSite(com.android.tools.r8.graph.DexCallSite):156:156 -> a
+    88:88:void registerCallSite(com.android.tools.r8.graph.DexCallSite):153:153 -> a
+    89:97:void registerCallSite(com.android.tools.r8.graph.DexCallSite):142:150 -> a
+    98:100:void registerProto(com.android.tools.r8.graph.DexProto):166:168 -> a
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
-    1:1:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):39:39 -> b
-    2:2:void registerConstClass(com.android.tools.r8.graph.DexType):71:71 -> b
+    1:1:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):41:41 -> b
+    2:2:void registerExceptionGuard(com.android.tools.r8.graph.DexType):82:82 -> b
+    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> c
-    1:1:void registerExceptionGuard(com.android.tools.r8.graph.DexType):79:79 -> c
-    void registerInitClass(com.android.tools.r8.graph.DexType) -> d
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
-    1:1:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):45:45 -> d
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> e
+    1:1:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):47:47 -> d
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
+    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
     void registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> e
-    void registerNewInstance(com.android.tools.r8.graph.DexType) -> f
-    1:1:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):57:57 -> f
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
+    1:1:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):59:59 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
-    1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):63:63 -> h
+    1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):65:65 -> h
 com.android.tools.r8.graph.UseRegistry$MethodHandleUse -> com.android.tools.r8.graph.N0$a:
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse ARGUMENT_TO_LAMBDA_METAFACTORY -> a
     com.android.tools.r8.graph.UseRegistry$MethodHandleUse NOT_ARGUMENT_TO_LAMBDA_METAFACTORY -> b
-    1:2:void <clinit>():12:13 -> <clinit>
-    1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.l5:
+    1:2:void <clinit>():14:15 -> <clinit>
+    1:1:void <init>(java.lang.String,int):13:13 -> <init>
+com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis -> com.android.tools.r8.internal.n5:
     java.util.List r8InstructionSequence -> b
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> e
     java.util.List javacInstructionSequence -> a
@@ -23511,7 +23638,7 @@
     82:91:boolean com.android.tools.r8.graph.analysis.ClassInitializerAssertionEnablingAnalysis.hasKotlincClinitAssertionCode(com.android.tools.r8.graph.ProgramMethod):159:168 -> a
     82:91:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):45 -> a
     92:92:void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod):46:46 -> a
-com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.j8:
+com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis -> com.android.tools.r8.internal.o8:
     java.util.Map synthesizedWrappers -> b
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):25:25 -> <init>
@@ -23529,7 +23656,7 @@
     1:1:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> d
     1:1:void com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis.traceInvoke(com.android.tools.r8.graph.DexMethod):37:37 -> e
     1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):62 -> e
-com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.p9:
+com.android.tools.r8.graph.analysis.EnqueuerAnalysis -> com.android.tools.r8.internal.y9:
     1:1:void <init>():14:14 -> <init>
     void done(com.android.tools.r8.shaking.Enqueuer) -> a
     void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing) -> a
@@ -23537,10 +23664,10 @@
     void processNewlyLiveClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.EnqueuerWorklist) -> a
     void processNewlyLiveField(com.android.tools.r8.graph.ProgramField) -> a
     void processNewlyLiveMethod(com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.q9:
-com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.r9:
-com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.s9:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Ad:
+com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis -> com.android.tools.r8.internal.z9:
+com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis -> com.android.tools.r8.internal.B9:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis -> com.android.tools.r8.internal.Od:
     java.util.Map mapping -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:1:void <init>(com.android.tools.r8.graph.AppView):61:61 -> <init>
@@ -23548,8 +23675,8 @@
     1:17:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):67:83 -> a
     18:18:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):81:81 -> a
     19:19:void done(com.android.tools.r8.shaking.Enqueuer):89:89 -> a
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.zd:
-com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Ad$a:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1 -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods -> com.android.tools.r8.internal.Od$a:
     java.util.Map mapping -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -23557,17 +23684,17 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$1):20:20 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.AppView,java.util.Map):26:28 -> <init>
     1:18:boolean isClassDefinitelyLoadedInInstanceMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):33:50 -> a
-com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.internal.kc:
+com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses -> com.android.tools.r8.internal.tc:
     java.util.Set sources -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:2:void <init>(java.util.Set):17:18 -> <init>
     1:4:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):27:30 -> a
     5:5:boolean hasBeenMerged(com.android.tools.r8.graph.DexType):38:38 -> a
-com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.ho:
+com.android.tools.r8.graph.classmerging.MergedClasses -> com.android.tools.r8.internal.to:
     boolean hasBeenMerged(com.android.tools.r8.graph.DexType) -> a
     boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.io:
+com.android.tools.r8.graph.classmerging.MergedClassesCollection -> com.android.tools.r8.internal.uo:
     java.util.List collection -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -23575,7 +23702,7 @@
     1:1:void add(com.android.tools.r8.graph.classmerging.MergedClasses):18:18 -> a
     2:3:boolean verifyAllSourcesPruned(com.android.tools.r8.graph.AppView):23:24 -> a
     4:5:boolean hasBeenMerged(com.android.tools.r8.graph.DexType):31:32 -> a
-com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.IC:
+com.android.tools.r8.graph.classmerging.VerticallyMergedClasses -> com.android.tools.r8.internal.yD:
     java.util.Map mergedClasses -> b
     java.util.Map mergedClassesInverse -> c
     boolean $assertionsDisabled -> a
@@ -23590,85 +23717,105 @@
     1:1:java.util.Collection com.android.tools.r8.graph.classmerging.VerticallyMergedClasses.getSourcesFor(com.android.tools.r8.graph.DexType):31:31 -> e
     1:1:boolean isTarget(com.android.tools.r8.graph.DexType):44 -> e
     2:2:boolean isTarget(com.android.tools.r8.graph.DexType):44:44 -> e
-com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.D5:
+com.android.tools.r8.horizontalclassmerging.ClassMerger -> com.android.tools.r8.internal.F5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
-    com.android.tools.r8.graph.DexField classIdField -> l
-    com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger classStaticFieldsMerger -> i
+    com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder classMethodsBuilder -> h
+    com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessChangesBuilder -> g
+    java.util.Collection virtualMethodMergers -> k
+    java.util.Collection constructorMergers -> l
+    com.android.tools.r8.graph.DexField classIdField -> m
+    com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger classStaticFieldsMerger -> j
     com.android.tools.r8.graph.DexProgramClass target -> b
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> e
     java.util.List toMergeGroup -> c
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder mergedClassesBuilder -> f
-    com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder fieldAccessChangesBuilder -> g
-    java.util.Collection constructorMergers -> k
     boolean $assertionsDisabled -> a
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> h
-    java.util.Collection virtualMethodMergers -> j
-    1:1:void <clinit>():41:41 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassMerger$1):41:41 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):66:66 -> <init>
-    3:31:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):51:79 -> <init>
-    1:3:void buildClassIdentifierMap():96:98 -> a
-    4:5:void merge(com.android.tools.r8.graph.DexProgramClass):103:104 -> a
-    6:6:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():123:123 -> a
-    6:6:void merge(com.android.tools.r8.graph.DexProgramClass):104 -> a
-    7:10:void merge(com.android.tools.r8.graph.DexProgramClass):104:107 -> a
-    11:11:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):175:175 -> a
-    11:11:void merge(com.android.tools.r8.graph.DexProgramClass):107 -> a
-    12:18:void merge(com.android.tools.r8.graph.DexProgramClass):120:126 -> a
-    19:26:void lambda$merge$0(com.android.tools.r8.graph.ProgramMethod):109:116 -> a
-    27:27:boolean lambda$renameMethod$1(com.android.tools.r8.graph.DexMethod):140:140 -> a
-    28:34:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():157:163 -> a
-    28:34:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):173 -> a
-    35:35:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
-    35:35:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():163 -> a
-    35:35:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):173 -> a
-    36:36:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():165:165 -> a
-    36:36:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):173 -> a
-    37:39:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):175:177 -> a
-    40:41:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeConstructors(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):144:145 -> a
-    40:41:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):180 -> a
-    42:43:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeVirtualMethods():151:152 -> a
-    42:43:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):181 -> a
-    44:44:void com.android.tools.r8.horizontalclassmerging.ClassMerger.mergeStaticFields():169:169 -> a
-    44:44:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):182 -> a
-    1:1:java.lang.Iterable getClasses():92:92 -> b
-    2:2:java.lang.Iterable com.android.tools.r8.horizontalclassmerging.ClassMerger.getToMergeClasses():84:84 -> b
-    2:2:java.lang.Iterable getClasses():92 -> b
-    3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> b
-    3:3:java.lang.Iterable getClasses():92 -> b
-    4:7:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):135:138 -> b
-    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> b
-    8:8:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):138 -> b
-    9:9:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):138:138 -> b
-    10:10:com.android.tools.r8.graph.DexMethod renameMethod(com.android.tools.r8.graph.ProgramMethod):135:135 -> b
-com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.B5:
-com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.C5:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap classIdentifiers -> i
+    1:1:void <clinit>():42:42 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection,com.android.tools.r8.horizontalclassmerging.ClassMerger$1):42:42 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):68:68 -> <init>
+    3:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.graph.DexField,java.util.Collection,java.util.Collection):52:81 -> <init>
+    1:3:void buildClassIdentifierMap():98:100 -> a
+    4:14:void lambda$mergeDirectMethods$0(com.android.tools.r8.graph.ProgramMethod):114:124 -> a
+    15:15:void mergeConstructors(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):149:149 -> a
+    16:16:void lambda$mergeConstructors$1(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass,com.android.tools.r8.horizontalclassmerging.ConstructorMerger):151:151 -> a
+    17:17:void lambda$mergeVirtualMethods$2(com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger):162:162 -> a
+    18:18:boolean lambda$mergeInstanceFields$5(com.android.tools.r8.graph.DexProgramClass):193:193 -> a
+    1:4:void mergeDirectMethods(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):105:108 -> b
+    5:9:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):139:143 -> b
+    10:10:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():393:393 -> b
+    10:10:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):143 -> b
+    11:11:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):143:143 -> b
+    12:12:com.android.tools.r8.graph.DexMethod renameDirectMethod(com.android.tools.r8.graph.ProgramMethod):140:140 -> b
+    13:13:void lambda$mergeStaticFields$4(com.android.tools.r8.graph.DexProgramClass):182:182 -> b
+    14:15:void fixFinal():186:187 -> b
+    1:1:java.lang.Iterable getClasses():94:94 -> c
+    2:2:java.lang.Iterable com.android.tools.r8.horizontalclassmerging.ClassMerger.getToMergeClasses():86:86 -> c
+    2:2:java.lang.Iterable getClasses():94 -> c
+    3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> c
+    3:3:java.lang.Iterable getClasses():94 -> c
+    4:4:void lambda$mergeVirtualMethods$3(com.android.tools.r8.graph.DexProgramClass):164:164 -> c
+    5:5:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):200:200 -> c
+    6:12:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():168:174 -> c
+    6:12:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):201 -> c
+    13:13:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> c
+    13:13:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():174 -> c
+    13:13:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):201 -> c
+    14:14:void com.android.tools.r8.horizontalclassmerging.ClassMerger.appendClassIdField():176:176 -> c
+    14:14:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):201 -> c
+    15:22:void mergeGroup(com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):203:210 -> c
+    1:1:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):112:112 -> d
+    2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):175:175 -> d
+    2:2:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):112 -> d
+    3:3:void mergeDirectMethods(com.android.tools.r8.graph.DexProgramClass):130:130 -> d
+    4:7:void mergeInstanceFields():193:196 -> d
+    1:3:void mergeStaticFields():180:182 -> e
+    1:5:void mergeVirtualMethods():160:164 -> f
+com.android.tools.r8.horizontalclassmerging.ClassMerger$1 -> com.android.tools.r8.internal.D5:
+com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder -> com.android.tools.r8.internal.E5:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.List toMergeGroup -> d
     com.android.tools.r8.graph.DexProgramClass target -> c
     boolean $assertionsDisabled -> a
     java.util.Map constructorMergerBuilders -> e
     java.util.Map virtualMethodMergerBuilders -> f
-    1:1:void <clinit>():185:185 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):194:194 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):188:197 -> <init>
-    1:2:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder mergeClass(com.android.tools.r8.graph.DexProgramClass):201:202 -> a
-    3:3:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder addClassesToMerge(java.util.List):207:207 -> a
-    4:7:void addConstructor(com.android.tools.r8.graph.ProgramMethod):226:229 -> a
-    8:10:void addConstructor(com.android.tools.r8.graph.ProgramMethod):228:230 -> a
-    11:11:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$addConstructor$1(com.android.tools.r8.graph.DexProto):229:229 -> a
-    12:12:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$addVirtualMethod$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):238:238 -> a
-    13:38:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):247:272 -> a
-    1:1:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):212:212 -> b
+    1:1:void <clinit>():213:213 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):222:222 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):216:225 -> <init>
+    1:2:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder mergeClass(com.android.tools.r8.graph.DexProgramClass):229:230 -> a
+    3:3:com.android.tools.r8.horizontalclassmerging.ClassMerger$Builder addClassesToMerge(java.util.List):235:235 -> a
+    4:7:void addConstructor(com.android.tools.r8.graph.ProgramMethod):254:257 -> a
+    8:10:void addConstructor(com.android.tools.r8.graph.ProgramMethod):256:258 -> a
+    11:11:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder lambda$addConstructor$1(com.android.tools.r8.graph.DexProto):257:257 -> a
+    12:12:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder lambda$addVirtualMethod$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):266:266 -> a
+    13:22:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):275:284 -> a
+    23:41:com.android.tools.r8.horizontalclassmerging.ClassMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder):283:301 -> a
+    1:1:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):240:240 -> b
     2:2:void com.android.tools.r8.graph.DexProgramClass.forEachProgramDirectMethod(java.util.function.Consumer):175:175 -> b
-    2:2:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):212 -> b
-    3:3:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):222:222 -> b
+    2:2:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):240 -> b
+    3:3:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):250:250 -> b
     4:4:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):185:185 -> b
-    4:4:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):222 -> b
-    5:8:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):234:237 -> b
-    9:12:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):236:239 -> b
-    1:5:void lambda$setupForMethodMerging$0(com.android.tools.r8.graph.ProgramMethod):214:218 -> c
-com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.V5:
+    4:4:void setupForMethodMerging(com.android.tools.r8.graph.DexProgramClass):250 -> b
+    5:8:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):262:265 -> b
+    9:12:void addVirtualMethod(com.android.tools.r8.graph.ProgramMethod):264:267 -> b
+    1:5:void lambda$setupForMethodMerging$0(com.android.tools.r8.graph.ProgramMethod):242:246 -> c
+com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder -> com.android.tools.r8.internal.G5:
+    java.util.List directMethods -> d
+    java.util.List virtualMethods -> c
+    java.util.Set reservedMethods -> b
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():15:15 -> <clinit>
+    1:4:void <init>():15:18 -> <init>
+    1:3:void addDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):27:29 -> a
+    4:4:boolean isFresh(com.android.tools.r8.graph.DexMethod):33:33 -> a
+    5:5:boolean lambda$setClassMethods$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):37:37 -> a
+    6:11:void setClassMethods(com.android.tools.r8.graph.DexProgramClass):37:42 -> a
+    1:3:void addVirtualMethod(com.android.tools.r8.graph.DexEncodedMethod):21:23 -> b
+    4:4:boolean lambda$setClassMethods$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):39:39 -> b
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.belongsToVirtualPool():607:607 -> c
+    1:1:boolean lambda$setClassMethods$1(com.android.tools.r8.graph.DexEncodedMethod):38 -> c
+    1:1:boolean lambda$setClassMethods$3(com.android.tools.r8.graph.DexEncodedMethod):40:40 -> d
+com.android.tools.r8.horizontalclassmerging.ClassStaticFieldsMerger -> com.android.tools.r8.internal.Z5:
     java.util.Map targetFields -> c
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.graph.DexProgramClass target -> b
@@ -23676,16 +23823,17 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass):26:26 -> <init>
     2:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.graph.DexProgramClass):19:34 -> <init>
     1:1:boolean isFresh(com.android.tools.r8.graph.DexField):38:38 -> a
-    2:2:void addFields(com.android.tools.r8.graph.DexProgramClass):54:54 -> a
-    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
+    2:2:void addFields(com.android.tools.r8.graph.DexProgramClass):55:55 -> a
+    3:3:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> a
     3:3:void addField(com.android.tools.r8.graph.DexEncodedField):42 -> a
-    4:11:void addField(com.android.tools.r8.graph.DexEncodedField):43:50 -> a
+    4:7:void addField(com.android.tools.r8.graph.DexEncodedField):43:46 -> a
+    8:14:void addField(com.android.tools.r8.graph.DexEncodedField):45:51 -> a
     1:1:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
-    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> b
+    2:2:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> b
     2:2:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):32 -> b
     3:3:void lambda$new$0(com.android.tools.r8.graph.DexEncodedField):32:32 -> b
-    4:4:void merge(com.android.tools.r8.graph.DexProgramClass):58:58 -> b
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.j7:
+    4:4:void merge(com.android.tools.r8.graph.DexProgramClass):59:59 -> b
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPoint -> com.android.tools.r8.internal.o7:
     com.android.tools.r8.graph.DexField classIdField -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> n
     1:4:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexMethod):46:49 -> <init>
@@ -23701,7 +23849,7 @@
     1:1:void addRegisterClassIdAssignment(int):69:69 -> j
     2:32:void prepareMultiConstructorInstructions():80:110 -> j
     1:4:void prepareSingleConstructorInstructions():117:120 -> k
-com.android.tools.r8.horizontalclassmerging.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.k7:
+com.android.tools.r8.horizontalclassmerging.ConstructorEntryPointSynthesizedCode -> com.android.tools.r8.internal.p7:
     com.android.tools.r8.graph.DexField classIdField -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap typeConstructors -> f
     com.android.tools.r8.graph.DexMethod originalMethod -> d
@@ -23711,7 +23859,7 @@
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$getSourceCodeProvider$0(com.android.tools.r8.ir.code.Position):34:34 -> a
     2:3:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):44:45 -> a
     1:1:java.util.function.Consumer getRegistryCallback():40:40 -> z
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.m7:
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger -> com.android.tools.r8.internal.r7:
     java.util.Collection constructors -> d
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> e
     com.android.tools.r8.graph.AppView appView -> b
@@ -23721,38 +23869,36 @@
     1:1:void <clinit>():35:35 -> <clinit>
     1:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.graph.DexField):46:56 -> <init>
     1:1:int getArity():72:72 -> a
-    2:14:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):154:166 -> a
-    15:15:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):165:165 -> a
-    16:16:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():64:64 -> a
-    16:16:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
-    17:17:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():115:115 -> a
-    17:17:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():65 -> a
-    17:17:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
-    18:18:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():66:66 -> a
-    18:18:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
-    19:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.appendTypeToMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2040:2041 -> a
-    19:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():66 -> a
-    19:20:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169 -> a
-    21:24:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):170:173 -> a
-    25:38:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):171:184 -> a
-    39:39:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():143:143 -> a
-    39:39:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):187 -> a
-    40:42:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):188:190 -> a
-    43:43:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
-    43:43:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):190 -> a
-    44:44:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():115:115 -> a
-    44:44:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):195 -> a
-    45:73:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):198:226 -> a
-    74:74:boolean lambda$merge$2(com.android.tools.r8.graph.DexMethod):174:174 -> a
-    75:75:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
-    75:75:com.android.tools.r8.graph.DexProto lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):54 -> a
-    1:4:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):119:122 -> b
-    5:5:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> b
-    5:5:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):123 -> b
-    6:6:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):123:123 -> b
-    7:24:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.graph.DexEncodedMethod):120:137 -> b
-    25:25:boolean lambda$moveConstructor$1(com.android.tools.r8.graph.DexMethod):125:125 -> b
-com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.l7:
+    2:5:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):120:123 -> a
+    6:6:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():393:393 -> a
+    6:6:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):124 -> a
+    7:7:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):124:124 -> a
+    8:21:com.android.tools.r8.graph.DexMethod moveConstructor(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.DexEncodedMethod):121:134 -> a
+    22:34:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):153:165 -> a
+    35:35:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):164:164 -> a
+    36:36:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():64:64 -> a
+    36:36:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):168 -> a
+    37:37:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():115:115 -> a
+    37:37:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():65 -> a
+    37:37:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):168 -> a
+    38:38:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():66:66 -> a
+    38:38:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):168 -> a
+    39:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.appendTypeToMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):2089:2090 -> a
+    39:40:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.ConstructorMerger.generateReferenceMethodTemplate():66 -> a
+    39:40:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):168 -> a
+    41:44:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):169:172 -> a
+    45:58:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):170:183 -> a
+    59:59:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.horizontalclassmerging.ConstructorMerger.getAccessFlags():141:141 -> a
+    59:59:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):186 -> a
+    60:62:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):187:189 -> a
+    63:63:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    63:63:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):189 -> a
+    64:64:boolean com.android.tools.r8.horizontalclassmerging.ConstructorMerger.isTrivialMerge():115:115 -> a
+    64:64:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):194 -> a
+    65:93:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):197:225 -> a
+    94:94:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():393:393 -> a
+    94:94:com.android.tools.r8.graph.DexProto lambda$new$0(com.android.tools.r8.graph.DexEncodedMethod):54 -> a
+com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder -> com.android.tools.r8.internal.q7:
     com.android.tools.r8.graph.AppView appView -> d
     java.util.List constructorGroups -> c
     boolean $assertionsDisabled -> a
@@ -23762,7 +23908,7 @@
     2:8:void <init>(com.android.tools.r8.graph.AppView):77:83 -> <init>
     1:2:void createNewGroup():87:88 -> a
     3:6:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):92:95 -> a
-    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():279:279 -> a
+    7:7:int com.android.tools.r8.utils.InternalOptions.minimumVerificationSizeLimitInBytes():280:280 -> a
     7:7:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):95 -> a
     8:8:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
     9:10:void com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder.createNewGroup():87:88 -> a
@@ -23770,33 +23916,34 @@
     11:12:com.android.tools.r8.horizontalclassmerging.ConstructorMerger$Builder add(com.android.tools.r8.graph.DexEncodedMethod):100:101 -> a
     13:14:java.util.List build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):107:108 -> a
     15:15:com.android.tools.r8.horizontalclassmerging.ConstructorMerger lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,java.util.List):110:110 -> a
-com.android.tools.r8.horizontalclassmerging.FieldMultiset -> com.android.tools.r8.internal.ya:
+com.android.tools.r8.horizontalclassmerging.FieldMultiset -> com.android.tools.r8.internal.Ha:
     com.android.tools.r8.com.google.common.collect.Multiset fields -> a
     1:1:void <init>(com.android.tools.r8.graph.DexProgramClass):17:17 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexProgramClass):15:19 -> <init>
     1:3:boolean equals(java.lang.Object):30:32 -> equals
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.fc:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger -> com.android.tools.r8.internal.oc:
     com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.horizontalclassmerging.PolicyExecutor policyExecutor -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():49:49 -> <clinit>
-    1:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):56:79 -> <init>
-    25:59:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):61:95 -> <init>
-    1:12:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):100:111 -> a
-    13:13:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.empty():26:26 -> a
-    13:13:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):111 -> a
-    14:22:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):111:119 -> a
-    23:36:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,java.util.Collection):150:163 -> a
-    23:36:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):124 -> a
-    37:42:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):126:131 -> a
-    43:44:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):172:173 -> a
-    43:44:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):132 -> a
-    45:46:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):135:136 -> a
-    47:54:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):187:194 -> a
-    47:54:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):137 -> a
-    55:55:java.util.List lambda$run$0(com.android.tools.r8.horizontalclassmerging.FieldMultiset):104:104 -> a
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.ic:
+    1:1:void <clinit>():51:51 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView):54:56 -> <init>
+    1:11:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):64:74 -> a
+    12:31:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.getPolicies(com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):110:110 -> a
+    12:31:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):74 -> a
+    32:35:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):74:77 -> a
+    36:36:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.empty():26:26 -> a
+    36:36:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):77 -> a
+    37:45:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):77:85 -> a
+    46:59:java.util.List com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.initializeClassMergers(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,java.util.Collection):155:168 -> a
+    46:59:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):90 -> a
+    60:65:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):92:97 -> a
+    66:67:void com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.applyClassMergers(java.util.Collection,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):177:178 -> a
+    66:67:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):98 -> a
+    68:69:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):101:102 -> a
+    70:77:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger.createLens(com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):192:199 -> a
+    70:77:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.shaking.RuntimeTypeCheckInfo):103 -> a
+    78:78:java.util.List lambda$run$0(com.android.tools.r8.horizontalclassmerging.FieldMultiset):68:68 -> a
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens -> com.android.tools.r8.internal.rc:
     java.util.Map methodExtraParameters -> m
     java.util.Map originalConstructorSignatures -> n
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> o
@@ -23811,8 +23958,8 @@
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> g
     3:3:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.prependSingleton(java.lang.Object,java.lang.Iterable):65 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):57 -> g
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.gc:
-com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.hc:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$1 -> com.android.tools.r8.internal.pc:
+com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.qc:
     com.android.tools.r8.horizontalclassmerging.ManyToOneMap methodMap -> c
     java.util.Map methodExtraParameters -> d
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> b
@@ -23841,7 +23988,7 @@
     2:2:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder.mapMethodInverse(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):150:150 -> c
     2:2:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder moveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):157 -> c
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder recordExtraOriginalSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):136:136 -> d
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.jc:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses -> com.android.tools.r8.internal.sc:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():17:17 -> <clinit>
@@ -23857,18 +24004,18 @@
     2:2:boolean com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses.isMergeTarget(com.android.tools.r8.graph.DexType):51:51 -> e
     2:2:boolean hasBeenMergedOrIsMergeTarget(com.android.tools.r8.graph.DexType):55 -> e
     1:1:boolean isMergeTarget(com.android.tools.r8.graph.DexType):51:51 -> f
-com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.jc$a:
+com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses$Builder -> com.android.tools.r8.internal.sc$a:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap mergedClasses -> a
     1:2:void <init>():73:74 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses build():78:78 -> a
     2:3:void addMergeGroup(com.android.tools.r8.graph.DexProgramClass,java.util.Collection):82:83 -> a
-com.android.tools.r8.horizontalclassmerging.ManyToOneInverseMap -> com.android.tools.r8.internal.An:
+com.android.tools.r8.horizontalclassmerging.ManyToOneInverseMap -> com.android.tools.r8.internal.Mn:
     java.util.Map extraMap -> b
     com.android.tools.r8.com.google.common.collect.BiMap biMap -> a
     1:3:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map):15:17 -> <init>
     1:1:com.android.tools.r8.com.google.common.collect.BiMap getBiMap():21:21 -> a
     1:1:java.util.Map getExtraMap():25:25 -> b
-com.android.tools.r8.horizontalclassmerging.ManyToOneMap -> com.android.tools.r8.internal.Bn:
+com.android.tools.r8.horizontalclassmerging.ManyToOneMap -> com.android.tools.r8.internal.Nn:
     java.util.Map forwardMap -> b
     java.util.Map inverseMap -> c
     java.util.Map representativeMap -> d
@@ -23884,69 +24031,68 @@
     2:2:java.util.Set lambda$remap$1(java.lang.Object):104:104 -> b
     1:1:java.util.Set lookupReverse(java.lang.Object):35:35 -> c
     2:3:java.lang.Object setRepresentative(java.lang.Object,java.lang.Object):47:48 -> c
-com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.Xo:
+com.android.tools.r8.horizontalclassmerging.MultiClassPolicy -> com.android.tools.r8.internal.jp:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     java.util.Collection apply(java.util.List) -> a
     1:1:boolean isTrivial(java.util.Collection):16:16 -> a
-    1:2:void removeTrivialGroups(java.util.Collection):23:24 -> b
-com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.Yo:
+    1:2:java.util.Collection removeTrivialGroups(java.util.Collection):24:25 -> b
+com.android.tools.r8.horizontalclassmerging.MultiClassSameReferencePolicy -> com.android.tools.r8.internal.kp:
     1:1:void <init>():14:14 -> <init>
     java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass) -> a
     1:6:java.util.Collection apply(java.util.List):17:22 -> a
     7:7:java.util.List lambda$apply$0(java.lang.Object):19:19 -> a
-com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.Cs:
+com.android.tools.r8.horizontalclassmerging.Policy -> com.android.tools.r8.internal.Os:
     int numberOfRemovedClasses -> a
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.Ds:
-    java.util.Collection policies -> a
-    1:2:void <init>(java.util.Collection):14:15 -> <init>
-    java.util.Collection run(java.util.Collection) -> a
-com.android.tools.r8.horizontalclassmerging.SimplePolicyExecutor -> com.android.tools.r8.internal.Tx:
-    boolean $assertionsDisabled -> b
+com.android.tools.r8.horizontalclassmerging.PolicyExecutor -> com.android.tools.r8.internal.Ps:
+    1:1:void <init>():11:11 -> <init>
+com.android.tools.r8.horizontalclassmerging.SimplePolicyExecutor -> com.android.tools.r8.internal.my:
+    boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
-    1:1:void <init>(java.util.Collection):21:21 -> <init>
-    1:8:java.util.LinkedList applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):27:34 -> a
-    9:9:boolean lambda$applySingleClassPolicy$0(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,com.android.tools.r8.graph.DexProgramClass):31:31 -> a
-    10:12:java.util.LinkedList applyMultiClassPolicy(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.LinkedList):43:45 -> a
-    13:13:java.util.stream.Stream lambda$applyMultiClassPolicy$1(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.List):44:44 -> a
-    14:32:java.util.Collection run(java.util.Collection):52:70 -> a
-    33:33:boolean lambda$run$2(java.util.List):70:70 -> a
-com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.Ux:
+    1:1:void <init>():19:19 -> <init>
+    1:8:java.util.LinkedList applySingleClassPolicy(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,java.util.LinkedList):24:31 -> a
+    9:9:boolean lambda$applySingleClassPolicy$0(com.android.tools.r8.horizontalclassmerging.SingleClassPolicy,com.android.tools.r8.graph.DexProgramClass):28:28 -> a
+    10:12:java.util.LinkedList applyMultiClassPolicy(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.LinkedList):40:42 -> a
+    13:13:java.util.stream.Stream lambda$applyMultiClassPolicy$1(com.android.tools.r8.horizontalclassmerging.MultiClassPolicy,java.util.List):41:41 -> a
+    14:32:java.util.Collection run(java.util.Collection,java.util.Collection):50:68 -> a
+    33:33:boolean lambda$run$2(java.util.List):68:68 -> a
+com.android.tools.r8.horizontalclassmerging.SingleClassPolicy -> com.android.tools.r8.internal.ny:
     1:1:void <init>():9:9 -> <init>
     boolean canMerge(com.android.tools.r8.graph.DexProgramClass) -> a
-com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses -> com.android.tools.r8.internal.Uz:
     java.util.Map subtypeMap -> c
     com.android.tools.r8.graph.AppView appView -> a
     java.util.Collection roots -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.List):39:39 -> <init>
-    2:8:void <init>(com.android.tools.r8.graph.AppView,java.util.List):35:41 -> <init>
-    1:1:void calculateSubtyping(java.lang.Iterable):49:49 -> a
-    2:2:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):53:53 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):45:45 -> a
-    3:3:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):56 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView):38:38 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView):35:40 -> <init>
+    1:1:void calculateSubtyping(java.lang.Iterable):48:48 -> a
+    2:2:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):52:52 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):44:44 -> a
+    3:3:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):55 -> a
     4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
-    4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):45 -> a
-    4:4:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):56 -> a
-    5:7:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):58:60 -> a
-    8:8:java.util.Collection getProgramRoots():65:65 -> a
-    9:9:void traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74:74 -> a
-    10:10:java.util.Collection com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):69:69 -> a
-    10:10:void traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):75 -> a
-    11:11:void traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):75:75 -> a
-    12:12:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):75:75 -> a
-    1:1:java.util.List lambda$calculateSubtyping$0(com.android.tools.r8.graph.DexProgramClass):60:60 -> b
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.Xz:
+    4:4:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.superClass(com.android.tools.r8.graph.DexProgramClass):44 -> a
+    4:4:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):55 -> a
+    5:7:void calculateSubtyping(com.android.tools.r8.graph.DexProgramClass):57:59 -> a
+    8:8:java.util.Collection getProgramRoots():64:64 -> a
+    9:9:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):73:73 -> a
+    10:10:java.util.Collection com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses.getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> a
+    10:10:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74 -> a
+    11:11:java.lang.Object traverseNodeDepthFirst(com.android.tools.r8.graph.DexProgramClass,java.lang.Object,java.util.function.BiFunction):74:74 -> a
+    12:12:void lambda$traverseNodeDepthFirst$1(java.lang.Object,java.util.function.BiFunction,com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    1:1:java.util.Collection getSubtypesFor(com.android.tools.r8.graph.DexProgramClass):68:68 -> b
+    1:1:java.util.List lambda$calculateSubtyping$0(com.android.tools.r8.graph.DexProgramClass):59:59 -> c
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass -> com.android.tools.r8.internal.qA:
     com.android.tools.r8.graph.DexType syntheticClassType -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1):39:39 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):44:45 -> <init>
     1:1:com.android.tools.r8.graph.DexType getArgumentClass():49:49 -> a
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.Vz:
-com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.Wz:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$1 -> com.android.tools.r8.internal.oA:
+com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass$Builder -> com.android.tools.r8.internal.pA:
     1:1:void <init>():52:52 -> <init>
     1:32:com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.lang.Iterable):60:91 -> a
-com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.NA:
+com.android.tools.r8.horizontalclassmerging.TreeFixer -> com.android.tools.r8.internal.gB:
     java.util.Map protoFixupCache -> b
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> g
     com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder lensBuilder -> d
@@ -23957,65 +24103,64 @@
     boolean $assertionsDisabled -> a
     com.android.tools.r8.com.google.common.collect.BiMap reservedInterfaceSignatures -> j
     com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses mergedClasses -> c
-    1:1:void <clinit>():43:43 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):60:60 -> <init>
-    2:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):44:66 -> <init>
-    1:16:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():123:138 -> a
-    17:39:java.util.Map fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):148:170 -> a
-    40:45:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):176:181 -> a
-    46:65:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):180:199 -> a
-    66:66:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexItemFactory.createGloballyFreshMemberString(java.lang.String):1817:1817 -> a
-    66:66:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):198 -> a
-    67:70:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):200:203 -> a
-    71:71:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):202:202 -> a
-    72:87:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):201:216 -> a
-    88:98:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):220:230 -> a
-    99:112:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):235:248 -> a
-    113:127:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):255:269 -> a
-    128:135:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):267:274 -> a
-    136:142:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):272:278 -> a
-    143:154:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):277:288 -> a
-    155:155:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):270:270 -> a
-    156:158:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):321:323 -> a
-    159:175:com.android.tools.r8.graph.DexString com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,java.util.Map):295:311 -> a
-    159:175:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):326 -> a
-    176:181:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):329:334 -> a
-    182:182:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
-    182:182:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):334 -> a
-    183:200:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):336:353 -> a
-    201:205:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):352:356 -> a
-    206:208:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):342:344 -> a
-    209:211:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):343:345 -> a
-    212:212:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
-    212:212:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):345 -> a
-    213:228:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):348:363 -> a
-    229:233:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):370:374 -> a
-    234:236:com.android.tools.r8.graph.DexField com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupFieldReference(com.android.tools.r8.graph.DexField):398:400 -> a
-    234:236:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):375 -> a
-    237:244:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):378:385 -> a
-    245:245:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):1793:1793 -> a
-    245:245:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):381 -> a
-    246:257:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):381:392 -> a
-    258:258:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383:383 -> a
-    259:259:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):179:179 -> a
-    259:259:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383 -> a
-    260:261:java.util.Optional lambda$fixupFields$5(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):383:384 -> a
-    262:262:boolean lambda$fixupFields$4(java.util.Set,com.android.tools.r8.graph.DexField):384:384 -> a
-    263:265:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):404:406 -> a
-    266:269:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):410:413 -> a
-    266:269:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
-    270:272:com.android.tools.r8.graph.DexType[] com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):436:438 -> a
-    270:272:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):413 -> a
-    270:272:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
-    273:274:com.android.tools.r8.graph.DexProto com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):414:415 -> a
-    273:274:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406 -> a
-    275:275:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):406:406 -> a
-    276:285:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):421:430 -> a
-    1:1:void fixupProgramClassSuperType(com.android.tools.r8.graph.DexProgramClass):143:143 -> b
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):161:161 -> b
-    3:3:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):227:227 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):167:167 -> c
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.KC:
+    1:1:void <clinit>():41:41 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):58:58 -> <init>
+    2:24:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.horizontalclassmerging.HorizontallyMergedClasses,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.horizontalclassmerging.SyntheticArgumentClass):42:64 -> <init>
+    1:15:com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens fixupTypeReferences():121:135 -> a
+    16:22:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):145:151 -> a
+    23:23:java.util.HashSet com.android.tools.r8.com.google.common.collect.Sets.newHashSet():218:218 -> a
+    23:23:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):153 -> a
+    24:32:com.android.tools.r8.com.google.common.collect.BiMap fixupProgramClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.com.google.common.collect.BiMap):155:163 -> a
+    33:38:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):169:174 -> a
+    39:48:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):173:182 -> a
+    49:51:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupMethodReference(com.android.tools.r8.graph.DexMethod):397:399 -> a
+    49:51:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):185 -> a
+    52:58:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):185:191 -> a
+    59:72:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualInterfaceMethod(com.android.tools.r8.graph.DexEncodedMethod):190:203 -> a
+    73:83:void fixupInterfaceClass(com.android.tools.r8.graph.DexProgramClass):207:217 -> a
+    84:97:com.android.tools.r8.graph.DexEncodedMethod fixupProgramMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):222:235 -> a
+    98:98:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):243:243 -> a
+    99:101:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupMethodReference(com.android.tools.r8.graph.DexMethod):397:399 -> a
+    99:101:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):246 -> a
+    102:111:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):248:257 -> a
+    112:119:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):255:262 -> a
+    120:126:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):260:266 -> a
+    127:141:com.android.tools.r8.graph.DexEncodedMethod fixupDirectMethod(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):265:279 -> a
+    142:142:boolean lambda$fixupDirectMethod$3(java.util.Set,com.android.tools.r8.graph.DexMethod):258:258 -> a
+    143:144:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):308:309 -> a
+    145:158:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.horizontalclassmerging.TreeFixer.lookupReservedVirtualName(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.com.google.common.collect.BiMap):285:298 -> a
+    145:158:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):312 -> a
+    159:159:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupMethodSignature(com.android.tools.r8.graph.DexMethodSignature):403:403 -> a
+    159:159:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):315 -> a
+    160:183:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):321:344 -> a
+    184:188:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):343:347 -> a
+    189:193:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):328:332 -> a
+    194:221:com.android.tools.r8.graph.DexEncodedMethod fixupVirtualMethod(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):329:356 -> a
+    222:224:boolean lambda$fixupVirtualMethod$5(java.util.Set,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.DexMethodSignature):334:336 -> a
+    225:229:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):363:367 -> a
+    230:232:com.android.tools.r8.graph.DexField com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupFieldReference(com.android.tools.r8.graph.DexField):391:393 -> a
+    230:232:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):368 -> a
+    233:240:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):371:378 -> a
+    241:241:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.DexItemFactory.createFreshMember(java.util.function.Function,java.lang.String):1803:1803 -> a
+    241:241:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):374 -> a
+    242:253:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):374:385 -> a
+    254:254:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):376:376 -> a
+    255:255:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexField.withName(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory):179:179 -> a
+    255:255:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):376 -> a
+    256:257:java.util.Optional lambda$fixupFields$7(com.android.tools.r8.graph.DexField,java.util.Set,com.android.tools.r8.graph.DexString):376:377 -> a
+    258:258:boolean lambda$fixupFields$6(java.util.Set,com.android.tools.r8.graph.DexField):377:377 -> a
+    259:261:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):397:399 -> a
+    262:265:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):407:410 -> a
+    266:268:com.android.tools.r8.graph.DexType[] com.android.tools.r8.horizontalclassmerging.TreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):433:435 -> a
+    266:268:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):410 -> a
+    269:270:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):411:412 -> a
+    271:280:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):418:427 -> a
+    1:1:void fixupProgramClassSuperType(com.android.tools.r8.graph.DexProgramClass):140:140 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$0(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):157:157 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupInterfaceClass$2(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):214:214 -> b
+    4:5:boolean lambda$fixupDirectMethod$4(java.util.Set,com.android.tools.r8.graph.DexMethod):271:272 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$fixupProgramClass$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):160:160 -> c
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPoint -> com.android.tools.r8.internal.AD:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> n
     com.android.tools.r8.graph.DexField classIdField -> o
@@ -24033,13 +24178,13 @@
     1:5:void handleReturn(int):101:105 -> i
     6:55:void prepareInstructions():111:160 -> i
     1:3:void addInvokeSuper():87:89 -> j
-com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.LC:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodEntryPointSynthesizedCode -> com.android.tools.r8.internal.BD:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap mappedMethods -> e
     1:6:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):24:29 -> <init>
     1:1:com.android.tools.r8.ir.conversion.SourceCode lambda$new$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position):26:26 -> a
     1:2:void registerReachableDefinitions(com.android.tools.r8.graph.UseRegistry):39:40 -> b
     1:1:java.util.function.Consumer getRegistryCallback():35:35 -> z
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.NC:
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger -> com.android.tools.r8.internal.DD:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     java.util.Collection methods -> d
     com.android.tools.r8.graph.DexField classIdField -> e
@@ -24049,47 +24194,52 @@
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):43:49 -> <init>
-    1:1:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():123:123 -> a
-    2:2:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
-    2:2:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():123 -> a
-    3:5:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():123:125 -> a
-    6:6:boolean lambda$getAccessFlags$1(com.android.tools.r8.graph.ProgramMethod):124:124 -> a
-    7:10:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):152:155 -> a
-    11:18:void com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.mergeTrivial(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):136:143 -> a
-    11:18:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):156 -> a
-    19:42:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):160:183 -> a
-    43:65:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):179:201 -> a
-    66:66:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
-    66:66:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):201 -> a
-    67:74:void merge(com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):207:214 -> a
-    75:75:boolean lambda$merge$2(com.android.tools.r8.graph.DexMethod):184:184 -> a
-    1:1:int getArity():94:94 -> b
-    2:6:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.graph.ProgramMethod):98:102 -> b
-    7:25:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.graph.ProgramMethod):100:118 -> b
-    26:26:boolean lambda$moveMethod$0(com.android.tools.r8.graph.DexMethod):105:105 -> b
-com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.MC:
+    1:5:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):104:108 -> a
+    6:20:com.android.tools.r8.graph.DexMethod moveMethod(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.graph.ProgramMethod):106:120 -> a
+    21:21:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():125:125 -> a
+    22:22:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
+    22:22:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():125 -> a
+    23:25:com.android.tools.r8.graph.MethodAccessFlags getAccessFlags():125:127 -> a
+    26:26:boolean lambda$getAccessFlags$0(com.android.tools.r8.graph.ProgramMethod):126:126 -> a
+    27:30:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):156:159 -> a
+    31:40:void com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.mergeTrivial(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder):138:147 -> a
+    31:40:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):160 -> a
+    41:64:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):164:187 -> a
+    65:87:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):183:205 -> a
+    88:88:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    88:88:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):205 -> a
+    89:96:void merge(com.android.tools.r8.horizontalclassmerging.ClassMethodsBuilder,com.android.tools.r8.horizontalclassmerging.HorizontalClassMergerGraphLens$Builder,com.android.tools.r8.shaking.FieldAccessInfoCollectionModifier$Builder,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):211:218 -> a
+    1:1:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger.getMethodReference():96:96 -> b
+    1:1:int getArity():100 -> b
+    2:2:int getArity():100:100 -> b
+com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder -> com.android.tools.r8.internal.CD:
     java.util.Collection methods -> a
     1:2:void <init>():52:53 -> <init>
     1:1:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder add(com.android.tools.r8.graph.ProgramMethod):56:56 -> a
-    2:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):63:67 -> a
-    2:6:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
-    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):68 -> a
-    7:7:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    8:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):68:80 -> a
-    8:20:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    21:21:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
-    21:21:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):81 -> a
-    21:21:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    22:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):81:83 -> a
-    22:24:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):88 -> a
-    25:25:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):89:89 -> a
+    2:2:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,int):89:89 -> a
+    3:6:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):62:65 -> a
+    3:6:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,int):89 -> a
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():610:610 -> a
+    7:7:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):66 -> a
+    7:7:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,int):89 -> a
+    8:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):66:77 -> a
+    8:19:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,int):89 -> a
+    20:20:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():610:610 -> a
+    20:20:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):78 -> a
+    20:20:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,int):89 -> a
+    21:23:com.android.tools.r8.graph.DexMethod com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger$Builder.superMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):78:80 -> a
+    21:23:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,int):89 -> a
+    24:24:com.android.tools.r8.horizontalclassmerging.VirtualMethodMerger build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,int):91:91 -> a
 com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated -> com.android.tools.r8.internal.U0:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:java.lang.Boolean com.android.tools.r8.horizontalclassmerging.policies.AllInstantiatedOrUninstantiated.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):12 -> a
-com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.V8:
+com.android.tools.r8.horizontalclassmerging.policies.ClassesHaveSameInterfaces -> com.android.tools.r8.internal.u6:
+    1:1:void <init>():11:11 -> <init>
+    1:1:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.horizontalclassmerging.policies.ClassesHaveSameInterfaces.getMergeKey(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
+    1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):11 -> a
+com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy -> com.android.tools.r8.internal.e9:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.MainDexTracingResult mainDexTracingResult -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult):24:26 -> <init>
@@ -24100,63 +24250,60 @@
     4:23:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):60 -> a
     24:24:boolean com.android.tools.r8.horizontalclassmerging.policies.DontInlinePolicy.disallowInlining(com.android.tools.r8.graph.ProgramMethod):48:48 -> a
     24:24:boolean lambda$canMerge$0(com.android.tools.r8.graph.ProgramMethod):60 -> a
-com.android.tools.r8.horizontalclassmerging.policies.DontMergeIntoLessVisible -> com.android.tools.r8.internal.W8:
+com.android.tools.r8.horizontalclassmerging.policies.DontMergeIntoLessVisible -> com.android.tools.r8.internal.f9:
     1:1:void <init>():15:15 -> <init>
     1:3:java.util.Collection apply(java.util.List):18:20 -> a
-    4:4:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
+    4:4:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> a
     4:4:java.util.Collection apply(java.util.List):21 -> a
     5:14:java.util.Collection apply(java.util.List):22:31 -> a
-com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.X8:
+com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses -> com.android.tools.r8.internal.g9:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):20:21 -> <init>
     1:1:boolean com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
     1:1:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
-    2:2:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):703:703 -> a
+    2:2:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):762:762 -> a
     2:2:boolean com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25 -> a
     2:2:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
     3:3:boolean com.android.tools.r8.horizontalclassmerging.policies.DontMergeSynchronizedClasses.isSynchronizationClass(com.android.tools.r8.graph.DexProgramClass):25:25 -> a
     3:3:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):34 -> a
     4:6:boolean lambda$apply$0(java.util.Collection,com.android.tools.r8.graph.DexProgramClass):36:38 -> a
     7:31:java.util.Collection apply(java.util.List):31:55 -> a
-com.android.tools.r8.horizontalclassmerging.policies.IgnoreSynthetics -> com.android.tools.r8.internal.xc:
+com.android.tools.r8.horizontalclassmerging.policies.IgnoreSynthetics -> com.android.tools.r8.internal.Jc:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
-    2:242:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:240 -> a
-    2:242:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoAbstractClasses -> com.android.tools.r8.internal.Lp:
+    2:240:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:238 -> a
+    2:240:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):22 -> a
+com.android.tools.r8.horizontalclassmerging.policies.NoAbstractClasses -> com.android.tools.r8.internal.Xp:
     1:1:void <init>():12:12 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:16 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoAnnotations -> com.android.tools.r8.internal.Mp:
+com.android.tools.r8.horizontalclassmerging.policies.NoAnnotations -> com.android.tools.r8.internal.Yp:
     1:1:void <init>():10:10 -> <init>
-    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
+    1:1:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoClassesOrMembersWithAnnotations -> com.android.tools.r8.internal.Np:
+com.android.tools.r8.horizontalclassmerging.policies.NoClassesOrMembersWithAnnotations -> com.android.tools.r8.internal.Zp:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoClassesWithInterfaces -> com.android.tools.r8.internal.Op:
-    1:1:void <init>():10:10 -> <init>
-    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.Pp:
+com.android.tools.r8.horizontalclassmerging.policies.NoEnums -> com.android.tools.r8.internal.aq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap cache -> c
     com.android.tools.r8.graph.AppView appView -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):20:20 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):18:21 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
     2:11:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):30:39 -> a
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     12:12:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):39 -> a
     13:15:boolean isEnumSubtype(com.android.tools.r8.graph.DexClass):40:42 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.Qp:
+com.android.tools.r8.horizontalclassmerging.policies.NoInnerClasses -> com.android.tools.r8.internal.bq:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFields -> com.android.tools.r8.internal.Rp:
+com.android.tools.r8.horizontalclassmerging.policies.NoInstanceFields -> com.android.tools.r8.internal.cq:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):13:13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.Sp:
+com.android.tools.r8.horizontalclassmerging.policies.NoInterfaces -> com.android.tools.r8.internal.dq:
     1:1:void <init>():10:10 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.Tp:
+com.android.tools.r8.horizontalclassmerging.policies.NoKeepRules -> com.android.tools.r8.internal.eq:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set dontMergeTypes -> c
     1:1:void <init>(com.android.tools.r8.graph.AppView):22:22 -> <init>
@@ -24165,43 +24312,53 @@
     1:11:void processClass(com.android.tools.r8.graph.DexProgramClass):29:39 -> b
     12:12:void processClass(com.android.tools.r8.graph.DexProgramClass):38:38 -> b
     13:21:void processClass(com.android.tools.r8.graph.DexProgramClass):36:44 -> b
-com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.Up:
+com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata -> com.android.tools.r8.internal.fq:
+    boolean $assertionsDisabled -> b
+    1:1:void <clinit>():11:11 -> <clinit>
+    1:1:void <init>():13:13 -> <init>
+    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):17:17 -> a
+    2:7:boolean com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata.verifyNoUnexpectedKotlinInfo(com.android.tools.r8.graph.DexProgramClass):22:27 -> a
+    2:7:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):17 -> a
+    8:8:boolean com.android.tools.r8.horizontalclassmerging.policies.NoKotlinMetadata.verifyNoUnexpectedKotlinInfo(com.android.tools.r8.graph.DexProgramClass):26:26 -> a
+    8:8:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):17 -> a
+    9:9:boolean lambda$verifyNoUnexpectedKotlinMemberInfo$0(com.android.tools.r8.graph.DexEncodedMember):33:33 -> a
+    1:3:boolean verifyNoUnexpectedKotlinMemberInfo(com.android.tools.r8.graph.DexProgramClass):32:32 -> b
+com.android.tools.r8.horizontalclassmerging.policies.NoNativeMethods -> com.android.tools.r8.internal.gq:
     1:1:void <init>():12:12 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoRuntimeTypeChecks -> com.android.tools.r8.internal.Vp:
+com.android.tools.r8.horizontalclassmerging.policies.NoRuntimeTypeChecks -> com.android.tools.r8.internal.hq:
     com.android.tools.r8.shaking.RuntimeTypeCheckInfo runtimeTypeCheckInfo -> b
     1:2:void <init>(com.android.tools.r8.shaking.RuntimeTypeCheckInfo):14:15 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):21:21 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.Wp:
+com.android.tools.r8.horizontalclassmerging.policies.NoServiceLoaders -> com.android.tools.r8.internal.iq:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set allServiceImplementations -> c
     1:4:void <init>(com.android.tools.r8.graph.AppView):18:21 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):26:27 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NoStaticClassInitializer -> com.android.tools.r8.internal.Xp:
+com.android.tools.r8.horizontalclassmerging.policies.NoStaticClassInitializer -> com.android.tools.r8.internal.jq:
     1:1:void <init>():15:15 -> <init>
     1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):18:18 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NotEntryPoint -> com.android.tools.r8.internal.hq:
+com.android.tools.r8.horizontalclassmerging.policies.NotEntryPoint -> com.android.tools.r8.internal.tq:
     com.android.tools.r8.graph.DexString main -> b
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):16:17 -> <init>
     1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23:24 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.iq:
-    java.util.Set neverMergeClassHorizontally -> b
-    1:2:void <init>(com.android.tools.r8.graph.AppView):17:18 -> <init>
-    1:1:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23:23 -> a
-    2:2:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
-    2:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23 -> a
-    3:3:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):23:23 -> a
-com.android.tools.r8.horizontalclassmerging.policies.NotVerticallyMergedIntoSubtype -> com.android.tools.r8.internal.jq:
+com.android.tools.r8.horizontalclassmerging.policies.NotMatchedByNoHorizontalClassMerging -> com.android.tools.r8.internal.uq:
+    java.util.Set neverMergeClassHorizontally -> c
+    java.util.Set deadEnumLiteMaps -> b
+    1:4:void <init>(com.android.tools.r8.graph.AppView):21:24 -> <init>
+    5:7:void <init>(com.android.tools.r8.graph.AppView):23:25 -> <init>
+    1:2:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):30:31 -> a
+com.android.tools.r8.horizontalclassmerging.policies.NotVerticallyMergedIntoSubtype -> com.android.tools.r8.internal.vq:
     com.android.tools.r8.graph.AppView appView -> b
     1:2:void <init>(com.android.tools.r8.graph.AppView):15:16 -> <init>
     1:4:boolean canMerge(com.android.tools.r8.graph.DexProgramClass):21:24 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility -> com.android.tools.r8.internal.Xs:
+com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility -> com.android.tools.r8.internal.jt:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():23:23 -> <init>
     1:16:java.util.Collection apply(java.util.List):57:72 -> a
     17:17:boolean lambda$apply$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility$TargetGroup):60:60 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility$TargetGroup -> com.android.tools.r8.internal.Ws:
+com.android.tools.r8.horizontalclassmerging.policies.PreventChangingVisibility$TargetGroup -> com.android.tools.r8.internal.it:
     java.util.List group -> a
     java.util.Map methodMap -> b
     1:3:void <init>():25:27 -> <init>
@@ -24215,7 +24372,7 @@
     10:10:boolean com.android.tools.r8.graph.AccessFlags.isSameVisibility(com.android.tools.r8.graph.AccessFlags):105:105 -> a
     10:10:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):43 -> a
     11:12:boolean tryAdd(com.android.tools.r8.graph.DexProgramClass):49:50 -> a
-com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex -> com.android.tools.r8.internal.Ys:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex -> com.android.tools.r8.internal.kt:
     com.android.tools.r8.shaking.MainDexTracingResult mainDexTracingResult -> d
     com.android.tools.r8.shaking.MainDexClasses mainDexClasses -> c
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult):23:25 -> <init>
@@ -24223,7 +24380,76 @@
     5:5:boolean com.android.tools.r8.horizontalclassmerging.policies.PreventMergeIntoMainDex.isMainDexClass(com.android.tools.r8.graph.DexProgramClass):29:29 -> a
     5:5:java.util.Collection apply(java.util.List):38 -> a
     6:16:java.util.Collection apply(java.util.List):39:49 -> a
-com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.ix:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation -> com.android.tools.r8.internal.tt:
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache interfaceDefaultMethodsCache -> e
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ParentClassSignaturesCache parentClassMethodsCache -> f
+    com.android.tools.r8.graph.AppView appView -> c
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ReservedInterfaceSignaturesFor reservedInterfaceSignaturesFor -> g
+    com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses subtypingForrestForClasses -> d
+    1:1:void <init>(com.android.tools.r8.graph.AppView):122:122 -> <init>
+    2:70:void <init>(com.android.tools.r8.graph.AppView):56:124 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$400(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):52:52 -> a
+    2:8:java.util.Collection apply(java.util.List):148:154 -> a
+    9:11:com.android.tools.r8.utils.collections.DexMethodSignatureSet com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation.computeReservedSignaturesForClass(com.android.tools.r8.graph.DexProgramClass):140:142 -> a
+    9:11:java.util.Collection apply(java.util.List):155 -> a
+    12:20:java.util.Collection apply(java.util.List):156:164 -> a
+    21:22:void com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature.addSignature(com.android.tools.r8.graph.DexMethodSignature,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory):134:135 -> a
+    21:22:java.util.Collection apply(java.util.List):167 -> a
+    23:25:java.util.Collection apply(java.util.List):169:171 -> a
+    26:26:java.util.List lambda$apply$0(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature):169:169 -> a
+    1:1:com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache access$600(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):52:52 -> b
+    1:1:com.android.tools.r8.horizontalclassmerging.SubtypingForrestForClasses access$700(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):52:52 -> c
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1 -> com.android.tools.r8.internal.lt:
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DexClassSignaturesCache -> com.android.tools.r8.internal.mt:
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> b
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):79:79 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):79:79 -> <init>
+    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):82:82 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    2:2:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):82 -> a
+    3:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexType):83:83 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$DispatchSignature -> com.android.tools.r8.internal.nt:
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():132:132 -> <clinit>
+    1:1:void <init>():132:132 -> <init>
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$InterfaceDefaultSignaturesCache -> com.android.tools.r8.internal.ot:
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):87:87 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):87:87 -> <init>
+    1:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):91:92 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory -> com.android.tools.r8.internal.pt:
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory KEEP_ABSENT -> b
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$MethodCategory CLASS_HIERARCHY_SAFE -> a
+    1:2:void <clinit>():128:129 -> <clinit>
+    1:1:void <init>(java.lang.String,int):127:127 -> <init>
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ParentClassSignaturesCache -> com.android.tools.r8.internal.qt:
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> c
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):96:96 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):96:96 -> <init>
+    1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):100:100 -> a
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():610:610 -> a
+    2:2:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):101 -> a
+    3:3:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):102:102 -> a
+    4:4:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():610:610 -> a
+    4:4:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):102 -> a
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    5:5:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):102 -> a
+    6:6:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):104:104 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$ReservedInterfaceSignaturesFor -> com.android.tools.r8.internal.rt:
+    com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation this$0 -> b
+    1:1:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation):110:110 -> <init>
+    2:2:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation,com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):110:110 -> <init>
+    1:1:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):110:110 -> a
+    2:2:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):115:115 -> a
+    3:6:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):114:117 -> a
+    7:9:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet):116:118 -> a
+com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$SignaturesCache -> com.android.tools.r8.internal.st:
+    java.util.Map memoizedSignatures -> a
+    1:2:void <init>():63:64 -> <init>
+    3:3:void <init>(com.android.tools.r8.horizontalclassmerging.policies.PreventMethodImplementation$1):63:63 -> <init>
+    void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.collections.DexMethodSignatureSet) -> a
+    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet getOrComputeSignatures(com.android.tools.r8.graph.DexClass):67:67 -> a
+    2:3:com.android.tools.r8.utils.collections.DexMethodSignatureSet lambda$getOrComputeSignatures$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):70:71 -> a
+com.android.tools.r8.horizontalclassmerging.policies.RespectPackageBoundaries -> com.android.tools.r8.internal.Bx:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):25:26 -> <init>
     1:6:com.android.tools.r8.utils.TraversalContinuation lambda$shouldRestrictMergingAcrossPackageBoundary$0(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):49:54 -> a
@@ -24232,26 +24458,26 @@
     18:25:java.util.Collection apply(java.util.List):91 -> a
     26:34:java.util.Collection apply(java.util.List):92:100 -> a
     35:35:java.util.List lambda$apply$1(java.lang.String):84:84 -> a
-    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
+    36:36:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> a
     36:36:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):31 -> a
     37:38:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):36:37 -> a
     39:39:boolean com.android.tools.r8.graph.AccessFlags.isPackagePrivateOrProtected():132:132 -> a
     39:39:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):37 -> a
     40:51:boolean shouldRestrictMergingAcrossPackageBoundary(com.android.tools.r8.graph.DexProgramClass):45:56 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.vx:
+com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit -> com.android.tools.r8.internal.Ox:
     com.android.tools.r8.graph.AppView appView -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView):16:17 -> <init>
     1:1:com.android.tools.r8.FeatureSplit com.android.tools.r8.horizontalclassmerging.policies.SameFeatureSplit.getMergeKey(com.android.tools.r8.graph.DexProgramClass):22:22 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):13 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.wx:
+com.android.tools.r8.horizontalclassmerging.policies.SameNestHost -> com.android.tools.r8.internal.Px:
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameNestHost.getMergeKey(com.android.tools.r8.graph.DexProgramClass):14:14 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):11 -> a
-com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.xx:
+com.android.tools.r8.horizontalclassmerging.policies.SameParentClass -> com.android.tools.r8.internal.Qx:
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.graph.DexType com.android.tools.r8.horizontalclassmerging.policies.SameParentClass.getMergeKey(com.android.tools.r8.graph.DexProgramClass):15:15 -> a
     1:1:java.lang.Object getMergeKey(com.android.tools.r8.graph.DexProgramClass):11 -> a
-com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.v5:
+com.android.tools.r8.inspector.internal.ClassInspectorImpl -> com.android.tools.r8.internal.x5:
     com.android.tools.r8.graph.DexClass clazz -> a
     com.android.tools.r8.references.ClassReference reference -> b
     1:1:void <init>(com.android.tools.r8.graph.DexClass):19:19 -> <init>
@@ -24261,7 +24487,7 @@
     1:1:void forEachField(java.util.function.Consumer):33:33 -> forEachField
     1:1:void forEachMethod(java.util.function.Consumer):38:38 -> forEachMethod
     1:4:com.android.tools.r8.references.ClassReference getClassReference():25:28 -> getClassReference
-com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.va:
+com.android.tools.r8.inspector.internal.FieldInspectorImpl -> com.android.tools.r8.internal.Ea:
     com.android.tools.r8.graph.DexEncodedField field -> b
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
     com.android.tools.r8.references.FieldReference reference -> c
@@ -24270,19 +24496,19 @@
     1:6:com.android.tools.r8.references.FieldReference getFieldReference():25:30 -> getFieldReference
     7:12:com.android.tools.r8.references.FieldReference getFieldReference():27:32 -> getFieldReference
     1:1:java.util.Optional getInitialValue():47:47 -> getInitialValue
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> getInitialValue
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> getInitialValue
     2:2:java.util.Optional getInitialValue():47 -> getInitialValue
     3:6:java.util.Optional getInitialValue():47:50 -> getInitialValue
     1:1:boolean isFinal():42:42 -> isFinal
     1:1:boolean isStatic():37:37 -> isStatic
-com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.Od:
+com.android.tools.r8.inspector.internal.InspectorImpl -> com.android.tools.r8.internal.ce:
     java.util.Collection classes -> a
     1:2:void <init>(java.util.Collection):43:44 -> <init>
     1:6:java.util.List wrapInspections(java.util.Collection):20:25 -> a
     7:7:java.util.List wrapInspections(java.util.Collection):21:21 -> a
     8:13:void runInspections(java.util.List,java.util.Collection):32:37 -> a
     1:2:void forEachClass(java.util.function.Consumer):49:50 -> forEachClass
-com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.zo:
+com.android.tools.r8.inspector.internal.MethodInspectorImpl -> com.android.tools.r8.internal.Lo:
     com.android.tools.r8.inspector.internal.ClassInspectorImpl parent -> a
     com.android.tools.r8.references.MethodReference reference -> c
     com.android.tools.r8.graph.DexEncodedMethod method -> b
@@ -24292,7 +24518,7 @@
     8:14:com.android.tools.r8.references.MethodReference getMethodReference():31:37 -> getMethodReference
     15:15:com.android.tools.r8.references.MethodReference getMethodReference():36:36 -> getMethodReference
     16:27:com.android.tools.r8.references.MethodReference getMethodReference():28:39 -> getMethodReference
-com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.tC:
+com.android.tools.r8.inspector.internal.ValueInspectorImpl -> com.android.tools.r8.internal.VC:
     com.android.tools.r8.graph.DexValue value -> a
     com.android.tools.r8.graph.DexType type -> b
     1:3:void <init>(com.android.tools.r8.graph.DexValue,com.android.tools.r8.graph.DexType):34:36 -> <init>
@@ -24353,7 +24579,7 @@
     1:1:boolean isPrimitive():46:46 -> isPrimitive
     1:1:boolean isShortValue():99:99 -> isShortValue
     1:1:boolean isStringValue():179:179 -> isStringValue
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.k5:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis -> com.android.tools.r8.internal.m5:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis TRIVIAL -> a
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.ir.code.IRCode code -> d
@@ -24377,19 +24603,19 @@
     2:4:void com.android.tools.r8.ir.analysis.ClassInitializationAnalysis.returnMarkingColor():227:229 -> b
     2:4:void notifyCodeHasChanged():218 -> b
     1:1:com.android.tools.r8.ir.analysis.ClassInitializationAnalysis trivial():94:94 -> c
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.j5:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$1 -> com.android.tools.r8.internal.l5:
     1:1:void <init>():67:67 -> <init>
     boolean isClassDefinitelyLoadedBeforeInstruction(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction) -> a
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.k5$a:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption -> com.android.tools.r8.internal.m5$a:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption NONE -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption INSTRUCTION_DOES_NOT_THROW -> a
     1:2:void <clinit>():57:58 -> <clinit>
     1:1:void <init>(java.lang.String,int):56:56 -> <init>
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.k5$b:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$InstructionUtils -> com.android.tools.r8.internal.m5$b:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():233:233 -> <clinit>
     1:5:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):241:245 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     6:6:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):245 -> a
     7:7:boolean forInitClass(com.android.tools.r8.ir.code.InitClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):246:246 -> a
     8:8:boolean forInstanceGet(com.android.tools.r8.ir.code.InstanceGet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):255:255 -> a
@@ -24404,7 +24630,7 @@
     25:31:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):295:301 -> a
     32:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     32:121:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):302 -> a
-    122:122:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    122:122:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     122:122:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     122:122:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):302 -> a
     123:124:boolean forInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):303:304 -> a
@@ -24413,13 +24639,13 @@
     155:161:boolean forInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):351:357 -> a
     162:179:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):367:384 -> a
     180:185:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):383:388 -> a
-    186:186:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    186:186:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     186:186:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):388 -> a
     187:197:boolean forInvokeSuper(com.android.tools.r8.ir.code.InvokeSuper,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):392:402 -> a
     198:215:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):412:429 -> a
     216:227:boolean forInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):428:439 -> a
     228:232:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):448:452 -> a
-    233:233:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    233:233:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     233:233:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):452 -> a
     234:234:boolean forNewInstance(com.android.tools.r8.ir.code.NewInstance,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):453:453 -> a
     235:235:boolean forStaticGet(com.android.tools.r8.ir.code.StaticGet,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):462:462 -> a
@@ -24428,7 +24654,7 @@
     253:253:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
     253:253:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):512 -> a
     254:269:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):513:528 -> a
-    270:270:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    270:270:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     270:270:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):532 -> a
     271:274:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):534:537 -> a
     275:275:boolean isTypeInitializedBy(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query):536:536 -> a
@@ -24439,12 +24665,12 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     2:2:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480 -> b
     3:10:boolean forStaticGetOrPut(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):480:487 -> b
-com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.k5$c:
+com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query -> com.android.tools.r8.internal.m5$c:
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY_OR_INDIRECTLY -> b
     com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query DIRECTLY -> a
     1:2:void <clinit>():62:63 -> <clinit>
     1:1:void <init>(java.lang.String,int):61:61 -> <init>
-com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.ir.analysis.DeterminismAnalysis -> com.android.tools.r8.internal.v8:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:2:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):22:23 -> a
@@ -24479,9 +24705,9 @@
     24:24:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67 -> a
     25:27:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68:70 -> a
     28:28:boolean returnValueOnlyDependsOnArguments(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):59:59 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.Cd:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis -> com.android.tools.r8.internal.Qd:
     1:15:java.util.Set computeInitializedClassesOnNormalExit(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39:53 -> a
-com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Bd:
+com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor -> com.android.tools.r8.internal.Pd:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set initializedClassesOnNormalExit -> d
     boolean $assertionsDisabled -> a
@@ -24492,7 +24718,7 @@
     1:1:java.util.Set build():68:68 -> a
     2:2:void markInitializedOnNormalExit(java.lang.Iterable):72:72 -> a
     3:8:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):76:81 -> a
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     9:9:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):81 -> a
     10:36:void markInitializedOnNormalExit(com.android.tools.r8.graph.DexType):85:111 -> a
     37:43:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction):117:123 -> a
@@ -24503,7 +24729,7 @@
     56:62:java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke):56 -> a
     63:63:java.lang.Void com.android.tools.r8.ir.analysis.InitializedClassesOnNormalExitAnalysis$Visitor.visit(com.android.tools.r8.ir.code.NewInstance):153:153 -> a
     63:63:java.lang.Object visit(com.android.tools.r8.ir.code.NewInstance):56 -> a
-com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.CB:
+com.android.tools.r8.ir.analysis.TypeChecker -> com.android.tools.r8.internal.WB:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.VerifyTypesHelper verifyTypesHelper -> c
     boolean $assertionsDisabled -> a
@@ -24515,7 +24741,7 @@
     5:6:boolean check(com.android.tools.r8.ir.code.IRCode):48:49 -> a
     7:20:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):70:83 -> a
     7:20:boolean check(com.android.tools.r8.ir.code.IRCode):49 -> a
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     21:21:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):83 -> a
     21:21:boolean check(com.android.tools.r8.ir.code.IRCode):49 -> a
     22:22:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Return,com.android.tools.r8.graph.DexEncodedMethod):84:84 -> a
@@ -24529,10 +24755,10 @@
     32:34:boolean com.android.tools.r8.ir.analysis.TypeChecker.check(com.android.tools.r8.ir.code.Throw):116:118 -> a
     32:34:boolean check(com.android.tools.r8.ir.code.IRCode):57 -> a
     35:46:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):95:106 -> a
-    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     47:47:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):106 -> a
     48:48:boolean checkFieldPut(com.android.tools.r8.ir.code.FieldInstruction):107:107 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.vC:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis -> com.android.tools.r8.internal.XC:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod context -> c
@@ -24546,7 +24772,7 @@
     24:113:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):165 -> a
     24:113:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
     24:113:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     114:114:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):165 -> a
     114:114:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
@@ -24554,7 +24780,7 @@
     115:115:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):166:166 -> a
     115:115:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
     115:115:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
-    116:116:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():162:162 -> a
+    116:116:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():163:163 -> a
     116:116:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addConstantValueToValueGraph(com.android.tools.r8.ir.code.Value):167 -> a
     116:116:boolean com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis.addValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):146 -> a
     116:116:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):100 -> a
@@ -24587,19 +24813,19 @@
     171:195:boolean anyValueMayDependOnEnvironment(java.lang.Iterable):112:136 -> a
     196:197:boolean lambda$anyValueMayDependOnEnvironment$0(java.util.Set,java.util.Set,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node):121:122 -> a
     198:203:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):247:252 -> a
-    204:204:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    204:204:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     204:204:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):252 -> a
     205:212:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):252:259 -> a
     213:213:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):43:43 -> a
     213:213:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):259 -> a
     214:228:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):260:274 -> a
-    229:233:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):895:899 -> a
+    229:233:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):923:927 -> a
     229:233:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):274 -> a
-    234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    234:234:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):899 -> a
+    234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    234:234:java.util.List com.android.tools.r8.graph.DexClass.getDirectAndIndirectInstanceFields(com.android.tools.r8.graph.AppView):927 -> a
     234:234:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):274 -> a
     235:249:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):275:289 -> a
-    250:250:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
+    250:250:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> a
     250:250:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):290 -> a
     251:256:boolean addNewInstanceValueToValueGraph(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node,com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph,java.util.Set,java.util.Set,com.android.tools.r8.utils.WorkList):296:301 -> a
     257:265:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):309:317 -> a
@@ -24626,7 +24852,7 @@
     316:316:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):352 -> a
     317:319:boolean anyValueMayBeMutatedBeforeMethodExit(java.util.Set,java.util.Set):355:357 -> a
     320:320:boolean lambda$anyValueMayBeMutatedBeforeMethodExit$1(com.android.tools.r8.graph.DexType):335:335 -> a
-com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.uC:
+com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState -> com.android.tools.r8.internal.WC:
     java.util.Set trackedValues -> c
     com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState EMPTY -> a
     boolean hasTrackedValueEscaped -> b
@@ -24634,7 +24860,7 @@
     1:6:void <init>():372:377 -> <init>
     1:1:com.android.tools.r8.ir.analysis.ValueMayDependOnEnvironmentAnalysis$TrackedValuesState empty():380:380 -> a
     2:2:boolean isTrackingValue(com.android.tools.r8.ir.code.Value):393:393 -> a
-com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.zC:
+com.android.tools.r8.ir.analysis.VerifyTypesHelper -> com.android.tools.r8.internal.bD:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
@@ -24647,7 +24873,7 @@
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     1:1:com.android.tools.r8.ir.analysis.constant.Bottom getInstance():13:13 -> c
-com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.Y6:
+com.android.tools.r8.ir.analysis.constant.ConstLatticeElement -> com.android.tools.r8.internal.d7:
     com.android.tools.r8.ir.code.ConstNumber value -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ConstNumber):11:12 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
@@ -24661,7 +24887,7 @@
     1:1:com.android.tools.r8.ir.code.ConstNumber getConstNumber():47:47 -> c
     1:1:int getIntValue():51:51 -> d
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.c7:
+com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement -> com.android.tools.r8.internal.h7:
     com.android.tools.r8.ir.code.Value value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():8:8 -> <clinit>
@@ -24682,12 +24908,12 @@
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
     1:1:com.android.tools.r8.ir.code.Value getConstRange():44:44 -> c
     1:1:java.lang.String toString():40:40 -> toString
-com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.Ql:
+com.android.tools.r8.ir.analysis.constant.LatticeElement -> com.android.tools.r8.internal.dm:
     1:1:void <init>():6:6 -> <init>
     com.android.tools.r8.ir.analysis.constant.ConstLatticeElement asConst() -> a
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     com.android.tools.r8.ir.analysis.constant.ConstRangeLatticeElement asConstRange() -> b
-com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.wy:
+com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation -> com.android.tools.r8.internal.Py:
     java.util.BitSet visitedBlocks -> i
     java.util.Map mapping -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -24769,13 +24995,13 @@
     110:123:void com.android.tools.r8.ir.analysis.constant.SparseConditionalConstantPropagation.addFlowEdgesForJumpInstruction(com.android.tools.r8.ir.code.JumpInstruction):234:247 -> b
     110:123:void visitInstruction(com.android.tools.r8.ir.code.Instruction):180 -> b
     124:129:void setExecutableEdge(int,int):253:258 -> b
-com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.DA:
+com.android.tools.r8.ir.analysis.constant.Top -> com.android.tools.r8.internal.WA:
     com.android.tools.r8.ir.analysis.constant.Top INSTANCE -> a
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():9:9 -> <init>
     com.android.tools.r8.ir.analysis.constant.LatticeElement meet(com.android.tools.r8.ir.analysis.constant.LatticeElement) -> a
     1:1:com.android.tools.r8.ir.analysis.constant.Top getInstance():13:13 -> c
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.sC:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph -> com.android.tools.r8.internal.UC:
     java.util.Map nodes -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():27:27 -> <clinit>
@@ -24787,7 +25013,7 @@
     6:13:void com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph.mergeNodes(java.lang.Iterable):45:52 -> b
     6:13:void mergeStronglyConnectedComponents():62 -> b
     14:14:void mergeStronglyConnectedComponents():63:63 -> b
-com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.rC:
+com.android.tools.r8.ir.analysis.environmentdependence.ValueGraph$Node -> com.android.tools.r8.internal.TC:
     java.util.Set predecessors -> c
     java.util.Set successors -> d
     com.android.tools.r8.ir.code.Value value -> a
@@ -24858,7 +25084,7 @@
     1:1:boolean com.android.tools.r8.ir.analysis.equivalence.BasicBlockBehavioralSubsumption.definesBlockLocalValue(com.android.tools.r8.ir.code.Instruction):172:172 -> c
     1:1:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):155 -> c
     2:10:boolean isBlockLocalInstructionWithoutSideEffects(com.android.tools.r8.ir.code.Instruction):158:166 -> c
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.aa:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysis -> com.android.tools.r8.internal.ja:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set trackedValues -> d
     java.util.Deque valuesToTrack -> e
@@ -24887,9 +25113,9 @@
     103:105:void addToWorklist(com.android.tools.r8.ir.code.Value):171:173 -> a
     1:9:boolean isEscaping(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):56:64 -> b
     10:10:boolean isValueOfInterestOrAlias(com.android.tools.r8.ir.code.Value):214:214 -> b
-com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.ba:
+com.android.tools.r8.ir.analysis.escape.EscapeAnalysisConfiguration -> com.android.tools.r8.internal.ka:
     boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.ma:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis -> com.android.tools.r8.internal.va:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker fieldAssignmentTracker -> b
     com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis fieldBitAccessAnalysis -> c
@@ -24901,10 +25127,10 @@
     5:24:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):65:84 -> a
     25:30:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):83:88 -> a
     31:38:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):87:94 -> a
-    39:39:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    39:39:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     39:39:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):94 -> a
     40:43:void recordFieldAccesses(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor):94:97 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.sa:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker -> com.android.tools.r8.internal.Ba:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set nonZeroFields -> e
     com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph fieldAccessGraph -> c
@@ -24943,7 +25169,7 @@
     161:161:void lambda$waveDone$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):291 -> a
     162:164:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):218:218 -> a
     162:164:void lambda$waveDone$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):291 -> a
-    165:165:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    165:165:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     165:165:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):222 -> a
     165:165:void lambda$waveDone$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexEncodedField):291 -> a
     166:166:void com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker.recordAllFieldPutsProcessed(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):223:223 -> a
@@ -24961,7 +25187,7 @@
     219:227:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):288:296 -> a
     228:228:void lambda$waveDone$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.graph.DexProgramClass):293:293 -> a
     1:5:void initializeAbstractInstanceFieldValues():85:89 -> b
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.sa$a:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$FieldAccessGraph -> com.android.tools.r8.internal.Ba$a:
     java.util.Map fieldWrites -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingFieldWrites -> b
     1:1:void <init>():309:309 -> <init>
@@ -24971,7 +25197,7 @@
     14:14:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):325:325 -> a
     15:16:void lambda$initialize$1(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.ProgramMethod):325:326 -> a
     17:24:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):333:340 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.sa$b:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldAssignmentTracker$ObjectAllocationGraph -> com.android.tools.r8.internal.Ba$b:
     java.util.Map objectAllocations -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap pendingObjectAllocations -> b
     1:1:void <init>():357:357 -> <init>
@@ -24980,7 +25206,7 @@
     3:6:void lambda$initialize$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set):364:367 -> a
     7:7:java.util.List lambda$initialize$0(com.android.tools.r8.graph.DexEncodedMethod):365:365 -> a
     8:15:void markProcessed(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):373:380 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.ta:
+com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis -> com.android.tools.r8.internal.Ca:
     1:1:void <init>():16:16 -> <init>
     1:9:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):20:28 -> a
     10:18:int com.android.tools.r8.ir.analysis.fieldaccess.FieldBitAccessAnalysis.computeBitsRead(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField):34:42 -> a
@@ -24992,7 +25218,7 @@
     20:30:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29 -> a
     31:31:void recordFieldAccess(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):29:29 -> a
     32:48:boolean isOnlyUsedToUpdateFieldValue(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexEncodedField):66:82 -> a
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.TA:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor -> com.android.tools.r8.internal.nB:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set fieldsOfInterest -> d
     com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> c
@@ -25027,26 +25253,26 @@
     60:73:boolean canOptimizeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView):130:143 -> a
     1:1:java.util.Set access$100(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> b
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$200(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor):34:34 -> c
-com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.SA:
+com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor$TrivialFieldAccessUseRegistry -> com.android.tools.r8.internal.mB:
     com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor this$0 -> d
     com.android.tools.r8.graph.ProgramMethod method -> c
     1:3:void <init>(com.android.tools.r8.ir.analysis.fieldaccess.TrivialFieldAccessReprocessor,com.android.tools.r8.graph.ProgramMethod):164:166 -> <init>
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
     1:5:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):170:174 -> a
-    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    6:6:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     6:6:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):177 -> a
     7:12:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,boolean):178:183 -> a
     13:13:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):196:196 -> a
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
+    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> c
     1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):191:191 -> c
-    void registerInitClass(com.android.tools.r8.graph.DexType) -> d
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> e
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
+    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):201:201 -> e
-    void registerNewInstance(com.android.tools.r8.graph.DexType) -> f
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):206:206 -> g
 com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet -> com.android.tools.r8.internal.m:
     1:1:void <clinit>():27:27 -> <clinit>
@@ -25056,7 +25282,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.V6:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet -> com.android.tools.r8.internal.a7:
     java.util.Set fields -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -25080,7 +25306,7 @@
     1:5:boolean equals(java.lang.Object):108:112 -> equals
     1:1:int hashCode():100:100 -> hashCode
     1:1:int size():95:95 -> size
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.e9:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet -> com.android.tools.r8.internal.n9:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -25089,7 +25315,7 @@
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet asKnownFieldSet() -> b
     boolean isKnownFieldSet() -> c
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.EmptyFieldSet getInstance():18:18 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Ja:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis -> com.android.tools.r8.internal.Sa:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.code.DominatorTree dominatorTree -> f
@@ -25173,13 +25399,13 @@
     51:51:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():254 -> b
     52:76:java.util.Map createFieldsMaybeReadBeforeBlockInclusive():255:279 -> b
     1:4:com.android.tools.r8.ir.code.DominatorTree getOrCreateDominatorTree():67:70 -> c
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Ia:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo -> com.android.tools.r8.internal.Ra:
     com.android.tools.r8.ir.code.Instruction instruction -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo instanceFieldInitializationInfo -> b
     1:3:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):42:44 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction access$000(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):36:36 -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo access$100(com.android.tools.r8.ir.analysis.fieldvalueanalysis.FieldValueAnalysis$FieldInitializationInfo):36:36 -> b
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.Wd:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis -> com.android.tools.r8.internal.ke:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder -> j
     com.android.tools.r8.graph.DexClassAndMethod parentConstructor -> l
     boolean $assertionsDisabled -> i
@@ -25194,7 +25420,7 @@
     2:27:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):73 -> a
     28:28:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection run(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):74:74 -> a
     29:29:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):128:128 -> a
-    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
+    30:30:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> a
     30:30:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):227 -> a
     30:30:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):128 -> a
     31:63:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenInstancePutAndMethodExit(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.InstancePut):231:263 -> a
@@ -25209,7 +25435,7 @@
     67:118:void com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.recordInstanceFieldIsInitializedWithValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):221 -> a
     67:118:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):129 -> a
     119:144:void analyzeForwardingConstructorCall(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.code.Value):134:159 -> a
-    145:145:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
+    145:145:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> a
     145:145:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):272 -> a
     145:145:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):177 -> a
     146:146:boolean com.android.tools.r8.ir.analysis.fieldvalueanalysis.InstanceFieldValueAnalysis.fieldNeverWrittenBetweenParentConstructorCallAndMethodExit(com.android.tools.r8.graph.DexEncodedField):275:275 -> a
@@ -25227,7 +25453,7 @@
     206:207:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):183:184 -> a
     208:259:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:51 -> a
     208:259:void lambda$analyzeParentConstructorCall$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):184 -> a
-    260:260:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    260:260:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     260:260:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):123 -> a
     261:261:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):123:123 -> a
     262:269:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo getInstanceFieldInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):192:199 -> a
@@ -25238,10 +25464,10 @@
     3:54:void com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder.recordInitializationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):0:51 -> b
     3:54:void recordInstanceFieldIsInitializedWithInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):216 -> b
     1:11:void analyzeParentConstructorCall():164:174 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.Rj:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.KnownFieldSet -> com.android.tools.r8.internal.ek:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.ConcreteMutableFieldSet asConcreteFieldSet() -> a
     boolean contains(com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.Iy:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis -> com.android.tools.r8.internal.bz:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():39:39 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):43:43 -> <init>
@@ -25262,7 +25488,7 @@
     47:49:com.android.tools.r8.ir.analysis.value.SingleFieldValue com.android.tools.r8.ir.analysis.fieldvalueanalysis.StaticFieldValueAnalysis.computeSingleFieldValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.Value):131:133 -> a
     47:49:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):104 -> a
     50:67:void updateFieldOptimizationInfo(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.Value):104:121 -> a
-    68:68:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    68:68:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     68:68:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):93 -> a
     69:70:boolean isSubjectToOptimization(com.android.tools.r8.graph.DexEncodedField):94:95 -> a
     71:72:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):330:331 -> a
@@ -25283,9 +25509,9 @@
     87:87:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):357 -> a
     88:111:com.android.tools.r8.ir.analysis.value.ObjectState computeObjectState(com.android.tools.r8.ir.code.Value):358:381 -> a
     112:113:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):367:368 -> a
-    114:114:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
+    114:114:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> a
     114:114:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):368 -> a
-    115:115:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1312:1312 -> a
+    115:115:boolean com.android.tools.r8.graph.DexItemFactory$EnumMembers.isNameOrOrdinalField(com.android.tools.r8.graph.DexField):1322:1322 -> a
     115:115:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):368 -> a
     116:123:void lambda$computeObjectState$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.ir.analysis.value.ObjectState$Builder,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):371:378 -> a
     1:37:com.android.tools.r8.ir.analysis.value.SingleFieldValue computeSingleEnumFieldValueForInstance(com.android.tools.r8.ir.code.Value):271:307 -> b
@@ -25331,7 +25557,7 @@
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> d
     21:21:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):405 -> d
     22:22:boolean isEnumValuesArray(com.android.tools.r8.ir.code.Value):406:406 -> d
-com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.ZB:
+com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet -> com.android.tools.r8.internal.uC:
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.UnknownFieldSet INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -25342,17 +25568,17 @@
     1:1:void <init>():10:10 -> <init>
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState join(com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
     boolean isAbstractState() -> c
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.w7:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult -> com.android.tools.r8.internal.B7:
     1:1:void <init>():20:20 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.u7:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$FailedDataflowAnalysisResult -> com.android.tools.r8.internal.z7:
     1:1:void <init>():38:38 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.v7:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult$SuccessfulDataflowAnalysisResult -> com.android.tools.r8.internal.A7:
     1:1:void <init>():30:30 -> <init>
-com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.ka:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.FailedTransferFunctionResult -> com.android.tools.r8.internal.ta:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState():17:17 -> a
     boolean isFailedTransferResult() -> b
-com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.ig:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis -> com.android.tools.r8.internal.vg:
     java.util.Map blockExitStates -> d
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction transfer -> c
     boolean $assertionsDisabled -> a
@@ -25373,31 +25599,87 @@
     15:16:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):42 -> a
     17:20:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult com.android.tools.r8.ir.analysis.framework.intraprocedural.IntraproceduralDataflowAnalysis.run(com.android.tools.r8.utils.WorkList):62:65 -> a
     17:20:com.android.tools.r8.ir.analysis.framework.intraprocedural.DataflowAnalysisResult run(com.android.tools.r8.ir.code.BasicBlock):42 -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunction -> com.android.tools.r8.internal.aB:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult apply(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState) -> a
-com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.IA:
+com.android.tools.r8.ir.analysis.framework.intraprocedural.TransferFunctionResult -> com.android.tools.r8.internal.bB:
     com.android.tools.r8.ir.analysis.framework.intraprocedural.AbstractState asAbstractState() -> a
     boolean isFailedTransferResult() -> b
     boolean isAbstractState() -> c
-com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.jm:
+com.android.tools.r8.ir.analysis.modeling.LibraryMethodReadSetModeling -> com.android.tools.r8.internal.wm:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
     1:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):20:33 -> a
-    15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1227:1227 -> a
+    15:15:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
     15:15:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33 -> a
     16:24:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet getModeledReadSetOrUnknown(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod):33:41 -> a
-com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.B9:
-    com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
-    com.android.tools.r8.graph.AppView appView -> a
-    java.util.Set deadEnumLiteMaps -> c
+com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker -> com.android.tools.r8.internal.K9:
+    com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
+    com.android.tools.r8.graph.AppView appView -> b
+    java.util.Set deadEnumLiteMaps -> d
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):43:43 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):41:45 -> <init>
-    1:1:void clearDeadEnumLiteMaps():55:55 -> a
-    1:3:void verifyDeadEnumLiteMapsAreDead():139:141 -> b
-    4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> b
-    4:4:void verifyDeadEnumLiteMapsAreDead():141 -> b
-    5:5:void verifyDeadEnumLiteMapsAreDead():141:141 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.tb:
+    1:1:void clearDeadEnumLiteMaps():59:59 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isProtoEnumShrinkingEnabled():1242:1242 -> a
+    2:2:void clearDeadEnumLiteMaps():59 -> a
+    3:11:void clearDeadEnumLiteMaps():59:67 -> a
+    12:12:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():74:74 -> a
+    12:12:void clearDeadEnumLiteMaps():70 -> a
+    13:13:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):84:84 -> a
+    13:13:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    13:13:void clearDeadEnumLiteMaps():70 -> a
+    14:19:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.computeCorrespondingEnumLite(com.android.tools.r8.graph.DexProgramClass):111:116 -> a
+    14:19:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):85 -> a
+    14:19:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    14:19:void clearDeadEnumLiteMaps():70 -> a
+    20:21:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.matchesFindValueByNumberMethod(com.android.tools.r8.graph.DexMethod):140:141 -> a
+    20:21:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.computeCorrespondingEnumLite(com.android.tools.r8.graph.DexProgramClass):116 -> a
+    20:21:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):85 -> a
+    20:21:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    20:21:void clearDeadEnumLiteMaps():70 -> a
+    22:22:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():45:45 -> a
+    22:22:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.matchesFindValueByNumberMethod(com.android.tools.r8.graph.DexMethod):142 -> a
+    22:22:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.computeCorrespondingEnumLite(com.android.tools.r8.graph.DexProgramClass):116 -> a
+    22:22:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):85 -> a
+    22:22:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    22:22:void clearDeadEnumLiteMaps():70 -> a
+    23:23:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.matchesFindValueByNumberMethod(com.android.tools.r8.graph.DexMethod):142:142 -> a
+    23:23:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.computeCorrespondingEnumLite(com.android.tools.r8.graph.DexProgramClass):116 -> a
+    23:23:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):85 -> a
+    23:23:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    23:23:void clearDeadEnumLiteMaps():70 -> a
+    24:35:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.computeCorrespondingEnumLite(com.android.tools.r8.graph.DexProgramClass):119:130 -> a
+    24:35:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):85 -> a
+    24:35:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    24:35:void clearDeadEnumLiteMaps():70 -> a
+    36:36:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
+    36:36:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.computeCorrespondingEnumLite(com.android.tools.r8.graph.DexProgramClass):130 -> a
+    36:36:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):85 -> a
+    36:36:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    36:36:void clearDeadEnumLiteMaps():70 -> a
+    37:38:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.computeCorrespondingEnumLite(com.android.tools.r8.graph.DexProgramClass):132:133 -> a
+    37:38:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):85 -> a
+    37:38:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    37:38:void clearDeadEnumLiteMaps():70 -> a
+    39:39:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):88:88 -> a
+    39:39:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    39:39:void clearDeadEnumLiteMaps():70 -> a
+    40:42:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.createInternalValueMapField(com.android.tools.r8.graph.DexType):53:55 -> a
+    40:42:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):88 -> a
+    40:42:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    40:42:void clearDeadEnumLiteMaps():70 -> a
+    43:46:boolean com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.isDeadEnumLiteMap(com.android.tools.r8.graph.DexProgramClass):88:91 -> a
+    43:46:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():75 -> a
+    43:46:void clearDeadEnumLiteMaps():70 -> a
+    47:49:void com.android.tools.r8.ir.analysis.proto.EnumLiteProtoShrinker.internalClearDeadEnumLiteMaps():76:78 -> a
+    47:49:void clearDeadEnumLiteMaps():70 -> a
+    1:1:java.util.Set getDeadEnumLiteMaps():49:49 -> b
+    1:3:void verifyDeadEnumLiteMapsAreDead():146:148 -> c
+    4:4:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> c
+    4:4:void verifyDeadEnumLiteMapsAreDead():148 -> c
+    5:5:void verifyDeadEnumLiteMapsAreDead():148:148 -> c
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker -> com.android.tools.r8.internal.Cb:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set classesWithRemovedExtensionFields -> d
@@ -25429,13 +25711,13 @@
     1:2:void recordDeadProtoExtensionField(com.android.tools.r8.graph.DexField):101:102 -> b
     3:5:void forEachFindLiteExtensionByNumberMethod(java.util.function.Consumer):171:173 -> b
     1:1:boolean wasRemoved(com.android.tools.r8.graph.DexField):149:149 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.sb:
+com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker$1 -> com.android.tools.r8.internal.Bb:
     com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker this$0 -> b
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):107:107 -> <init>
     1:1:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):112:112 -> a
     2:2:boolean com.android.tools.r8.shaking.DefaultTreePrunerConfiguration.isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):22:22 -> a
     2:2:boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):112 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Db:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker -> com.android.tools.r8.internal.Mb:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -25451,65 +25733,59 @@
     48:48:boolean lambda$computeEnableAggressiveBuilderOptimization$0(com.android.tools.r8.graph.DexClass):96:96 -> a
     49:56:boolean deferDeadProtoBuilders(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,java.util.function.BooleanSupplier):171:178 -> a
     57:62:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):192:197 -> a
-    63:63:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):371:371 -> a
+    63:63:void com.android.tools.r8.ir.conversion.IRConverter.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing):370:370 -> a
     63:63:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):197 -> a
     64:74:void rewriteDeadBuilderReferencesFromDynamicMethods(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):198:208 -> a
     75:76:void lambda$rewriteDeadBuilderReferencesFromDynamicMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):201:202 -> a
     77:77:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):216:216 -> a
     78:1102:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1024 -> a
     78:1102:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):217 -> a
-    1103:1108:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):219:224 -> a
-    1109:1109:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1109:1109:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):224 -> a
-    1110:1111:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):225:226 -> a
-    1112:1112:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1112:1112:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):226 -> a
-    1113:1118:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):230:235 -> a
-    1119:1119:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1119:1119:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):235 -> a
-    1120:1127:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):241:248 -> a
-    1128:1128:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    1128:1128:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):248 -> a
-    1129:1136:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):250:257 -> a
-    1137:1137:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    1137:1137:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):257 -> a
-    1138:1147:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):251:260 -> a
-    1148:1148:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):259:259 -> a
-    1149:1149:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Instruction):233:233 -> a
-    1150:1151:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$4(com.android.tools.r8.ir.code.Instruction):244:245 -> a
-    1152:1160:void addInliningHeuristicsForBuilderInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set):272:280 -> a
-    1161:1165:void preprocessCallGraphBeforeCycleElimination(java.util.Map):284:288 -> a
-    1166:1321:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):0:155 -> a
-    1166:1321:void preprocessCallGraphBeforeCycleElimination(java.util.Map):288 -> a
-    1322:1326:void preprocessCallGraphBeforeCycleElimination(java.util.Map):289:293 -> a
-    1327:1332:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):305:310 -> a
-    1333:1339:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):309:315 -> a
-    1340:1340:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):349:349 -> a
-    1341:2365:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1024 -> a
-    1341:2365:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):350 -> a
-    2366:2382:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):352:368 -> a
-    2383:2739:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):0:356 -> a
-    2383:2739:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
-    2740:2740:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    2740:2740:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):357 -> a
-    2740:2740:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
-    2741:2742:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):357:358 -> a
-    2741:2742:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
-    2743:2743:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):351:351 -> a
-    2743:2743:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):358 -> a
-    2743:2743:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
-    2744:2748:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):372:376 -> a
-    2749:2749:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
-    2749:2749:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):377 -> a
-    2750:2757:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):377:384 -> a
-    2758:2758:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    2758:2758:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):384 -> a
-    2759:2759:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):384:384 -> a
+    1103:1119:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):219:235 -> a
+    1120:1120:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    1120:1120:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):235 -> a
+    1121:1128:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):241:248 -> a
+    1129:1129:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    1129:1129:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):248 -> a
+    1130:1137:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):250:257 -> a
+    1138:1138:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    1138:1138:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):257 -> a
+    1139:1148:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):251:260 -> a
+    1149:1149:void rewriteDeadBuilderReferencesFromDynamicMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.IRConverter):259:259 -> a
+    1150:1150:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$3(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Instruction):233:233 -> a
+    1151:1152:boolean lambda$rewriteDeadBuilderReferencesFromDynamicMethod$4(com.android.tools.r8.ir.code.Instruction):244:245 -> a
+    1153:1161:void addInliningHeuristicsForBuilderInlining(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set):272:280 -> a
+    1162:1166:void preprocessCallGraphBeforeCycleElimination(java.util.Map):284:288 -> a
+    1167:1322:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences.isDynamicMethodBridge(com.android.tools.r8.graph.DexEncodedMethod):0:155 -> a
+    1167:1322:void preprocessCallGraphBeforeCycleElimination(java.util.Map):288 -> a
+    1323:1327:void preprocessCallGraphBeforeCycleElimination(java.util.Map):289:293 -> a
+    1328:1333:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):305:310 -> a
+    1334:1340:void inlineCallsToDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner):309:315 -> a
+    1341:1341:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):349:349 -> a
+    1342:2366:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1024 -> a
+    1342:2366:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):350 -> a
+    2367:2383:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):352:368 -> a
+    2384:2740:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):0:356 -> a
+    2384:2740:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    2741:2741:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    2741:2741:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):357 -> a
+    2741:2741:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    2742:2743:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):357:358 -> a
+    2742:2743:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    2744:2744:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.graph.DexField):351:351 -> a
+    2744:2744:boolean com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers.isNewMutableInstanceEnum(com.android.tools.r8.ir.code.Value):358 -> a
+    2744:2744:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):368 -> a
+    2745:2749:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):372:376 -> a
+    2750:2750:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.ir.analysis.type.ReferenceTypeElement.asMaybeNull():86:86 -> a
+    2750:2750:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):377 -> a
+    2751:2758:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):377:384 -> a
+    2759:2759:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    2759:2759:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):384 -> a
+    2760:2760:void strengthenCheckCastInstructions(com.android.tools.r8.ir.code.IRCode):384:384 -> a
     1:1:com.android.tools.r8.graph.AppView access$100(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):60:60 -> b
     2:2:boolean lambda$computeEnableAggressiveBuilderOptimization$1(com.android.tools.r8.graph.DexClass):111:111 -> b
     3:4:com.android.tools.r8.graph.analysis.EnqueuerAnalysis createEnqueuerAnalysis():127:128 -> b
     1:1:com.android.tools.r8.ir.analysis.proto.ProtoReferences access$200(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):60:60 -> c
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Bb:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$1 -> com.android.tools.r8.internal.Kb:
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker this$0 -> c
     java.util.Set val$seen -> b
     boolean $assertionsDisabled -> a
@@ -25517,7 +25793,7 @@
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker,java.util.Set):128:128 -> <init>
     1:1:void notifyFixpoint(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.utils.Timing):131:131 -> a
     2:8:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):133:139 -> a
-    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     9:9:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):139 -> a
     10:17:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):139:146 -> a
     18:21:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):145:148 -> a
@@ -25525,7 +25801,7 @@
     31:34:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):154:157 -> a
     35:40:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):156:161 -> a
     41:41:void lambda$notifyFixpoint$0(java.util.Set,com.android.tools.r8.shaking.EnqueuerWorklist,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):160:160 -> a
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Cb:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension -> com.android.tools.r8.internal.Lb:
     java.util.Set alwaysInline -> g
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> b
     java.util.Set bypassClinitforInlining -> h
@@ -25538,7 +25814,7 @@
     1:1:void alwaysClassInlineGeneratedMessageLiteBuilders():435:435 -> a
     2:3:boolean lambda$alwaysClassInlineGeneratedMessageLiteBuilders$0(com.android.tools.r8.graph.DexType):438:439 -> a
     4:5:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):443:444 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     6:6:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):444 -> a
     7:13:void bypassClinitforInliningNewBuilderMethods(com.android.tools.r8.graph.SubtypingInfo):444:450 -> a
     14:14:boolean lambda$bypassClinitforInliningNewBuilderMethods$1(com.android.tools.r8.graph.DexEncodedMethod):448:448 -> a
@@ -25553,7 +25829,7 @@
     6:7:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker$RootSetExtension.neverMergeGeneratedMessageLiteBuilder():468:469 -> b
     6:7:void extend(com.android.tools.r8.graph.SubtypingInfo):431 -> b
     8:10:void neverMergeClass(com.android.tools.r8.graph.DexType):479:481 -> b
-com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Eb:
+com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker -> com.android.tools.r8.internal.Nb:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder decoder -> c
     boolean $assertionsDisabled -> a
@@ -25568,25 +25844,16 @@
     1:2:void run(com.android.tools.r8.ir.code.IRCode):71:72 -> a
     3:11:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):123:131 -> a
     3:11:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    12:12:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156:156 -> a
-    12:12:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
-    12:12:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    12:12:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    13:13:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    13:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):158 -> a
-    13:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
-    13:13:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    13:13:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    14:14:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):158:158 -> a
-    14:14:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
-    14:14:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    14:14:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    12:14:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156:158 -> a
+    12:14:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
+    12:14:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    12:14:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
     15:15:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
     15:15:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
     15:15:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
     15:15:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     15:15:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    16:16:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     16:16:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
     16:16:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteInfoArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):156 -> a
     16:16:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):150 -> a
@@ -25596,74 +25863,65 @@
     17:19:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
     17:19:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     17:19:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():31:31 -> a
+    20:20:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():33:33 -> a
     20:20:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):169 -> a
     20:20:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
     20:20:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     20:20:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    21:28:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):170:177 -> a
-    21:28:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    21:28:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    21:28:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    29:29:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    29:29:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):177 -> a
-    29:29:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    29:29:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    29:29:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    30:31:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):178:179 -> a
-    30:31:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    30:31:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    30:31:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    32:32:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> a
-    32:32:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):178 -> a
-    32:32:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    32:32:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    32:32:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    33:35:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):182:184 -> a
-    33:35:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    33:35:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    33:35:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    36:36:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> a
-    36:36:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):185 -> a
-    36:36:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    36:36:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    36:36:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    37:39:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):186:188 -> a
-    37:39:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    37:39:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    37:39:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    40:40:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> a
-    40:40:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):186 -> a
+    21:30:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):170:179 -> a
+    21:30:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    21:30:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    21:30:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    31:31:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> a
+    31:31:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):178 -> a
+    31:31:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    31:31:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    31:31:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    32:34:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):182:184 -> a
+    32:34:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    32:34:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    32:34:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    35:35:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> a
+    35:35:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):185 -> a
+    35:35:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    35:35:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    35:35:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    36:38:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):186:188 -> a
+    36:38:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    36:38:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    36:38:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    39:39:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> a
+    39:39:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):186 -> a
+    39:39:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    39:39:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    39:39:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    40:40:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):193:193 -> a
     40:40:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
     40:40:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
     40:40:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    41:41:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):193:193 -> a
-    41:41:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    41:41:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    41:41:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    42:44:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:33 -> a
-    42:44:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):193 -> a
-    42:44:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
-    42:44:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
-    42:44:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    45:48:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):137:140 -> a
-    45:48:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
-    49:60:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):80:91 -> a
-    61:61:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):87:87 -> a
-    62:62:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):85:85 -> a
-    63:66:void forEachDynamicMethod(java.util.function.Consumer):95:98 -> a
-    67:72:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):101:106 -> a
-    73:73:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):110:110 -> a
-    74:77:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):198:201 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.Yu:
+    41:43:void com.android.tools.r8.ir.analysis.proto.ProtoUtils.setObjectsValueForMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.ProtoReferences):31:33 -> a
+    41:43:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteObjectsArgumentToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):193 -> a
+    41:43:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteArgumentsToNewMessageInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):151 -> a
+    41:43:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):134 -> a
+    41:43:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    44:47:void com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker.rewriteDynamicMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):137:140 -> a
+    44:47:void run(com.android.tools.r8.ir.code.IRCode):73 -> a
+    48:59:void postOptimizeDynamicMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):80:91 -> a
+    60:60:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):87:87 -> a
+    61:61:void lambda$postOptimizeDynamicMethods$0(com.android.tools.r8.ir.conversion.IRConverter,com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):85:85 -> a
+    62:65:void forEachDynamicMethod(java.util.function.Consumer):95:98 -> a
+    66:71:void lambda$forEachDynamicMethod$1(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.graph.DexProgramClass):101:106 -> a
+    72:72:void lambda$forEachDynamicMethod$2(com.android.tools.r8.ir.desugar.LambdaDescriptor):110:110 -> a
+    73:76:com.android.tools.r8.ir.code.InvokeMethod getNewMessageInfoInvoke(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.ProtoReferences):198:201 -> a
+com.android.tools.r8.ir.analysis.proto.ProtoEnqueuerUseRegistry -> com.android.tools.r8.internal.tv:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> f
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory FACTORY -> e
-    1:1:void <clinit>():18:18 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer):24:25 -> <init>
-    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():29:29 -> b
-    2:6:void registerConstClass(com.android.tools.r8.graph.DexType):41:45 -> b
-    1:5:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):57:61 -> e
-com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.dv:
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer):26:27 -> <init>
+    1:5:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):44:48 -> a
+    1:1:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getFactory():31:31 -> b
+    1:5:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):60:64 -> e
+com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy -> com.android.tools.r8.internal.yv:
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy parent -> b
     boolean $assertionsDisabled -> a
@@ -25700,7 +25958,7 @@
     510:510:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
     511:514:com.android.tools.r8.ir.optimize.Inliner$Reason com.android.tools.r8.ir.analysis.proto.ProtoInliningReasonStrategy.computeInliningReasonForDynamicMethod(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):79:82 -> a
     511:514:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):46 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.lv:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences -> com.android.tools.r8.internal.Gv:
     com.android.tools.r8.graph.DexType rawMessageInfoType -> l
     com.android.tools.r8.graph.DexType generatedMessageLiteExtendableBuilderType -> j
     com.android.tools.r8.graph.DexType methodToInvokeType -> n
@@ -25746,28 +26004,28 @@
     3:3:boolean isGeneratedMessageLiteBuilder(com.android.tools.r8.graph.DexProgramClass):175 -> b
     1:2:boolean isFindLiteExtensionByNumberMethod(com.android.tools.r8.graph.DexMethod):163:164 -> c
     1:1:boolean isMessageInfoConstructionMethod(com.android.tools.r8.graph.DexMethod):179:179 -> d
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.lv$a:
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.lv$b:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$1 -> com.android.tools.r8.internal.Gv$a:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedExtensionMethods -> com.android.tools.r8.internal.Gv$b:
     com.android.tools.r8.graph.DexMethod constructorWithClass -> b
     com.android.tools.r8.graph.DexMethod constructor -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):186:186 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):191:195 -> <init>
     7:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):193:205 -> <init>
     20:20:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):203:203 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.lv$c:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteBuilderMethods -> com.android.tools.r8.internal.Gv$c:
     com.android.tools.r8.graph.DexMethod constructorMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):280:280 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):285:289 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):287:294 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):292:292 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.lv$d:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteExtendableBuilderMethods -> com.android.tools.r8.internal.Gv$d:
     com.android.tools.r8.graph.DexMethod constructorMethod -> b
     com.android.tools.r8.graph.DexMethod buildPartialMethod -> a
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):299:299 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):304:308 -> <init>
     7:14:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):306:313 -> <init>
     15:15:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):311:311 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.lv$e:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$GeneratedMessageLiteMethods -> com.android.tools.r8.internal.Gv$e:
     com.android.tools.r8.graph.DexMethod newSingularGeneratedExtension -> e
     com.android.tools.r8.graph.DexMethod newRepeatedGeneratedExtension -> d
     com.android.tools.r8.graph.DexMethod dynamicMethodBridgeMethodWithObject -> c
@@ -25781,7 +26039,7 @@
     32:39:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):247:254 -> <init>
     40:55:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):252:267 -> <init>
     56:56:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):265:265 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.lv$f:
+com.android.tools.r8.ir.analysis.proto.ProtoReferences$MethodToInvokeMembers -> com.android.tools.r8.internal.Gv$f:
     com.android.tools.r8.graph.DexField newMutableInstanceField -> f
     com.android.tools.r8.graph.DexField newBuilderField -> e
     com.android.tools.r8.graph.DexField setMemoizedIsInitializedField -> g
@@ -25791,7 +26049,7 @@
     com.android.tools.r8.graph.DexField getMemoizedIsInitializedField -> c
     1:1:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.analysis.proto.ProtoReferences$1):319:319 -> <init>
     2:19:void <init>(com.android.tools.r8.ir.analysis.proto.ProtoReferences,com.android.tools.r8.graph.DexItemFactory):329:346 -> <init>
-com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.mv:
+com.android.tools.r8.ir.analysis.proto.ProtoShrinker -> com.android.tools.r8.internal.Hv:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> c
     com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker generatedMessageLiteBuilderShrinker -> f
     java.util.Set deadProtoTypes -> i
@@ -25803,21 +26061,21 @@
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> h
     1:1:void <clinit>():16:16 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):28:28 -> <init>
-    2:22:void <init>(com.android.tools.r8.graph.AppView):26:46 -> <init>
-    1:1:java.util.Set getDeadProtoTypes():50:50 -> a
-    2:4:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):60:62 -> a
-    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():803:803 -> a
-    5:5:void setDeadProtoTypes(java.util.Set):55 -> a
-    6:6:void setDeadProtoTypes(java.util.Set):56:56 -> a
-    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():804:804 -> a
-    7:7:void setDeadProtoTypes(java.util.Set):55 -> a
-com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.ov:
+    2:25:void <init>(com.android.tools.r8.graph.AppView):26:49 -> <init>
+    1:1:java.util.Set getDeadProtoTypes():53:53 -> a
+    2:4:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):63:65 -> a
+    5:5:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():809:809 -> a
+    5:5:void setDeadProtoTypes(java.util.Set):58 -> a
+    6:6:void setDeadProtoTypes(java.util.Set):59:59 -> a
+    7:7:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():810:810 -> a
+    7:7:void setDeadProtoTypes(java.util.Set):58 -> a
+com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.Jv:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():11:11 -> <clinit>
     boolean isProto2(int) -> a
     1:3:com.android.tools.r8.ir.code.Value getInfoValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):17:19 -> a
     1:3:com.android.tools.r8.ir.code.Value getObjectsValueFromMessageInfoConstructionInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.analysis.proto.ProtoReferences):24:26 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.xv:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder -> com.android.tools.r8.internal.Sv:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> b
     com.android.tools.r8.ir.analysis.proto.ProtoReferences references -> c
     boolean $assertionsDisabled -> a
@@ -25845,7 +26103,7 @@
     161:161:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     161:161:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):202 -> a
     162:164:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):203:205 -> a
-    165:166:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):403:404 -> a
+    165:166:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexClass.lookupUniqueInstanceFieldWithName(com.android.tools.r8.graph.DexString):417:418 -> a
     165:166:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):205 -> a
     167:171:com.android.tools.r8.ir.analysis.proto.schema.ProtoObject createProtoObject(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.ProgramMethod):207:211 -> a
     172:172:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
@@ -25872,7 +26130,7 @@
     4:19:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):310:325 -> b
     20:20:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):318:318 -> b
     21:21:com.android.tools.r8.utils.ThrowingIterator createObjectIterator(com.android.tools.r8.ir.code.Value):307:307 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.wv:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1 -> com.android.tools.r8.internal.Rv:
     com.android.tools.r8.graph.DexString val$info -> b
     com.android.tools.r8.utils.ThrowingCharIterator charIterator -> a
     1:3:void <init>(com.android.tools.r8.graph.DexString):260:262 -> <init>
@@ -25885,7 +26143,7 @@
     9:9:int nextInt():292:292 -> b
     10:10:int nextInt():281:281 -> b
     11:11:int nextInt():272:272 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.xv$a:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2 -> com.android.tools.r8.internal.Sv$a:
     com.android.tools.r8.ir.code.Value val$objectsValue -> c
     com.android.tools.r8.ir.code.InstructionIterator val$instructionIterator -> b
     int expectedNextIndex -> a
@@ -25900,10 +26158,10 @@
     16:16:java.lang.Object next():325 -> b
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$2.next():347:347 -> b
     17:17:java.lang.Object next():325 -> b
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.xv$b:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$InvalidRawMessageInfoException -> com.android.tools.r8.internal.Sv$b:
     1:1:void <init>():370:370 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.analysis.proto.RawMessageInfoDecoder$1):370:370 -> <init>
-com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.yv:
+com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder -> com.android.tools.r8.internal.Tv:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.DexItemFactory):24:25 -> <init>
     1:1:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):29:29 -> a
@@ -25916,23 +26174,20 @@
     55:70:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.analysis.proto.RawMessageInfoEncoder.encodeInfo(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):81:96 -> a
     55:70:com.android.tools.r8.graph.DexString encodeInfo(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):77 -> a
     1:12:java.util.List encodeObjects(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):100:111 -> b
-com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.B7:
+com.android.tools.r8.ir.analysis.proto.schema.DeadProtoFieldObject -> com.android.tools.r8.internal.G7:
     com.android.tools.r8.graph.DexString name -> b
     com.android.tools.r8.graph.DexType holder -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):20:22 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:27 -> a
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.Nm:
+com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject -> com.android.tools.r8.internal.an:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):23:24 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
-    1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:34 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34 -> a
-    3:8:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):35:40 -> a
+    1:7:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):34:40 -> a
     1:1:com.android.tools.r8.graph.DexField getField():28:28 -> g
     1:1:java.lang.String toString():55:55 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.Xu:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoEnqueuerExtension -> com.android.tools.r8.internal.sv:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory factory -> d
     java.util.Set dynamicMethodsWithTracedProtoObjects -> i
     com.android.tools.r8.graph.AppView appView -> b
@@ -25977,7 +26232,7 @@
     127:127:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     127:127:java.util.Map collectExtensionFields():261 -> a
     128:136:java.util.Map collectExtensionFields():262:270 -> a
-    137:137:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    137:137:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     137:137:java.util.Map collectExtensionFields():270 -> a
     138:152:java.util.Map collectExtensionFields():270:284 -> a
     153:153:java.util.Map collectExtensionFields():283:283 -> a
@@ -26037,12 +26292,12 @@
     399:405:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):610:616 -> a
     406:432:boolean reachesMapOrRequiredField(com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo):615:641 -> a
     433:441:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):650:658 -> a
-    442:442:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    442:442:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     442:442:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):658 -> a
     443:457:com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo getOrCreateProtoMessageInfo(com.android.tools.r8.graph.DexType):658:672 -> a
     1:25:void populateExtensionGraph(com.android.tools.r8.shaking.Enqueuer):214:238 -> b
     26:26:java.util.Set lambda$populateExtensionGraphWithExtensionFieldDefinition$2(com.android.tools.r8.graph.DexType):341:341 -> b
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.Zu:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldInfo -> com.android.tools.r8.internal.uv:
     java.util.List objects -> e
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType type -> c
     java.util.OptionalInt auxData -> d
@@ -26099,11 +26354,11 @@
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType getType():66:66 -> d
     1:1:boolean hasAuxData():44:44 -> e
     1:15:java.lang.String toString():209:223 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.av:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject -> com.android.tools.r8.internal.vv:
     1:1:void <init>():7:7 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject asProtoFieldObject() -> b
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.bv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType -> com.android.tools.r8.internal.wv:
     boolean needsIsInitializedCheck -> e
     boolean isMapFieldWithProto2EnumValue -> f
     boolean hasHasBit -> g
@@ -26131,7 +26386,7 @@
     1:1:boolean isValid():127:127 -> k
     1:1:boolean needsIsInitializedCheck():132:132 -> l
     1:14:int serialize():152:165 -> m
-com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.cv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldTypeFactory -> com.android.tools.r8.internal.xv:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap fieldTypes -> b
     1:1:void <clinit>():10:10 -> <clinit>
@@ -26140,7 +26395,7 @@
     2:72:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType.fromFieldIdWithExtraBits(int):0:70 -> a
     2:72:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):17 -> a
     73:74:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldType createField(int):18:19 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.fv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo -> com.android.tools.r8.internal.Av:
     java.util.LinkedList hasBitsObjects -> d
     java.util.LinkedList oneOfObjects -> e
     int flags -> b
@@ -26161,8 +26416,8 @@
     1:1:int numberOfHasBitsObjects():235:235 -> j
     1:1:int numberOfOneOfObjects():239:239 -> k
     1:9:java.lang.String toString():244:252 -> toString
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.ev:
-com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.fv$a:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$1 -> com.android.tools.r8.internal.zv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoMessageInfo$Builder -> com.android.tools.r8.internal.Av$a:
     java.util.LinkedList fields -> d
     java.util.LinkedList hasBitsObjects -> e
     java.util.LinkedList oneOfObjects -> f
@@ -26198,7 +26453,7 @@
     81:88:void removeUnusedSharedData():159:166 -> c
     89:89:void removeUnusedSharedData():165:165 -> c
     90:91:void removeUnusedSharedData():84:85 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.gv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObject -> com.android.tools.r8.internal.Bv:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.analysis.proto.schema.LiveProtoFieldObject asLiveProtoFieldObject() -> a
     com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
@@ -26207,23 +26462,18 @@
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     boolean isDeadProtoFieldObject() -> e
     boolean isProtoFieldObject() -> f
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.hv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromInvokeStatic -> com.android.tools.r8.internal.Cv:
     com.android.tools.r8.graph.DexMethod method -> a
     1:2:void <init>(com.android.tools.r8.graph.DexMethod):21:22 -> <init>
     1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):27:29 -> a
-    4:4:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28 -> a
-    5:5:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:30 -> a
-com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.iv:
+    4:6:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):28:30 -> a
+com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet -> com.android.tools.r8.internal.Dv:
     com.android.tools.r8.graph.DexField field -> a
     1:2:void <init>(com.android.tools.r8.graph.DexField):20:21 -> <init>
-    1:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:31 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):31 -> a
-    4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):32:32 -> a
+    1:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):30:32 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoObjectFromStaticGet asProtoObjectFromStaticGet() -> c
     1:1:com.android.tools.r8.graph.DexField getField():25:25 -> g
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.jv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfFieldType -> com.android.tools.r8.internal.Ev:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>(int,boolean,boolean,boolean,boolean,boolean):20:20 -> <init>
@@ -26235,7 +26485,7 @@
     boolean isRepeated() -> h
     boolean isSingular() -> j
     1:1:boolean isValid():60:60 -> k
-com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.kv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoOneOfObjectPair -> com.android.tools.r8.internal.Fv:
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfCaseObject -> b
     com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject oneOfObject -> a
     1:3:void <init>(com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject,com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject):15:17 -> <init>
@@ -26243,20 +26493,15 @@
     2:3:void forEach(java.util.function.Consumer):29:30 -> a
     1:1:com.android.tools.r8.ir.analysis.proto.schema.ProtoFieldObject getOneOfObject():21:21 -> b
     1:1:java.util.stream.Stream stream():34:34 -> c
-com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.nv:
+com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject -> com.android.tools.r8.internal.Iv:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):16:17 -> <init>
     1:1:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26:26 -> a
-    2:2:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1159:1159 -> a
-    2:2:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    3:3:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    3:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1159 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
-    4:4:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1160:1160 -> a
-    4:4:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
+    2:3:com.android.tools.r8.ir.code.ConstClass com.android.tools.r8.ir.code.IRCode.createConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):1156:1157 -> a
+    2:3:com.android.tools.r8.ir.code.Instruction buildIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):26 -> a
     com.android.tools.r8.ir.analysis.proto.schema.ProtoTypeObject asProtoTypeObject() -> d
     1:1:com.android.tools.r8.graph.DexType getType():21:21 -> g
-com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.internal.o5:
+com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect -> com.android.tools.r8.internal.q5:
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CANNOT_BE_POSTPONED -> a
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect SIDE_EFFECTS_THAT_CAN_BE_POSTPONED -> b
     com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect NONE -> c
@@ -26313,13 +26558,13 @@
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ByteTypeElement getInstance():11:11 -> H
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.b5:
+com.android.tools.r8.ir.analysis.type.CharTypeElement -> com.android.tools.r8.internal.c5:
     com.android.tools.r8.ir.analysis.type.CharTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.CharTypeElement getInstance():11:11 -> H
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.d6:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement -> com.android.tools.r8.internal.h6:
     java.util.Set lazyInterfaces -> g
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> f
@@ -26340,7 +26585,7 @@
     8:10:boolean isBasedOnMissingClass(com.android.tools.r8.graph.AppView):107:109 -> a
     11:11:boolean lambda$isBasedOnMissingClass$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):109:109 -> a
     12:29:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):154:171 -> a
-    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     30:30:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):174 -> a
     31:33:com.android.tools.r8.ir.analysis.type.TypeElement fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):175:177 -> a
     34:34:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -26357,7 +26602,7 @@
     184:239:java.lang.Object com.android.tools.r8.utils.LRUCacheTable.get(java.lang.Object,java.lang.Object):0:55 -> a
     184:239:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):299 -> a
     240:267:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):299:326 -> a
-    268:268:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    268:268:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     268:268:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):328 -> a
     269:308:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):330:369 -> a
     309:309:java.util.Set computeLeastUpperBoundOfInterfaces(com.android.tools.r8.graph.AppView,java.util.Set,java.util.Set):293:293 -> a
@@ -26371,16 +26616,16 @@
     boolean isClassType() -> s
     1:11:java.lang.String toString():129:139 -> toString
     12:16:java.lang.String toString():138:142 -> toString
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.d6$a:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker -> com.android.tools.r8.internal.h6$a:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker RIGHT -> b
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker LEFT -> a
     1:2:void <clinit>():232:233 -> <clinit>
     1:1:void <init>(java.lang.String,int):231:231 -> <init>
-com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.d6$b:
+com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceWithMarker -> com.android.tools.r8.internal.h6$b:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker marker -> b
     com.android.tools.r8.graph.DexType itf -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement$InterfaceMarker):240:242 -> <init>
-com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.Z7:
+com.android.tools.r8.ir.analysis.type.DestructivePhiTypeUpdater -> com.android.tools.r8.internal.e8:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.function.Function mapping -> c
     boolean $assertionsDisabled -> a
@@ -26415,31 +26660,31 @@
     57:57:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     57:57:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73 -> a
     58:58:void recomputeAndPropagateTypes(com.android.tools.r8.ir.code.IRCode,java.util.Set):73:73 -> a
-com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.Y8:
+com.android.tools.r8.ir.analysis.type.DoubleTypeElement -> com.android.tools.r8.internal.h9:
     com.android.tools.r8.ir.analysis.type.DoubleTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.DoubleTypeElement getInstance():11:11 -> H
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.ab:
+com.android.tools.r8.ir.analysis.type.FloatTypeElement -> com.android.tools.r8.internal.jb:
     com.android.tools.r8.ir.analysis.type.FloatTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.FloatTypeElement getInstance():10:10 -> H
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.Wf:
+com.android.tools.r8.ir.analysis.type.IntTypeElement -> com.android.tools.r8.internal.jg:
     com.android.tools.r8.ir.analysis.type.IntTypeElement INSTANCE -> e
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.IntTypeElement getInstance():10:10 -> H
     1:1:int hashCode():25:25 -> hashCode
-com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.nn:
+com.android.tools.r8.ir.analysis.type.LongTypeElement -> com.android.tools.r8.internal.zn:
     com.android.tools.r8.ir.analysis.type.LongTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.LongTypeElement getInstance():11:11 -> H
     1:1:int hashCode():26:26 -> hashCode
-com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.kq:
+com.android.tools.r8.ir.analysis.type.Nullability -> com.android.tools.r8.internal.wq:
     com.android.tools.r8.ir.analysis.type.Nullability DEFINITELY_NULL -> a
     com.android.tools.r8.ir.analysis.type.Nullability BOTTOM -> d
     com.android.tools.r8.ir.analysis.type.Nullability MAYBE_NULL -> c
@@ -26460,7 +26705,7 @@
     2:2:boolean isNullable():45:45 -> g
     1:1:com.android.tools.r8.ir.analysis.type.Nullability maybeNull():87:87 -> h
     1:13:java.lang.String toString():96:108 -> toString
-com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.lq:
+com.android.tools.r8.ir.analysis.type.NullabilityVariants -> com.android.tools.r8.internal.xq:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement definitelyNotNullVariant -> d
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement bottomVariant -> e
@@ -26472,7 +26717,7 @@
     4:12:void set(com.android.tools.r8.ir.analysis.type.Nullability,com.android.tools.r8.ir.analysis.type.ReferenceTypeElement):26:34 -> a
     13:21:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement get(com.android.tools.r8.ir.analysis.type.Nullability):39:47 -> a
     22:35:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateElement(com.android.tools.r8.ir.analysis.type.Nullability,java.util.function.BiFunction):53:66 -> a
-com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.Zs:
+com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement -> com.android.tools.r8.internal.ut:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():13:13 -> <init>
@@ -26519,7 +26764,7 @@
     87:87:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):120:120 -> a
     88:88:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement fromNumericType(com.android.tools.r8.ir.code.NumericType):118:118 -> a
     com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement asPrimitiveType() -> c
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.vw:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement -> com.android.tools.r8.internal.Ow:
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_BOTTOM_INSTANCE -> d
     com.android.tools.r8.ir.analysis.type.Nullability nullability -> e
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement NULL_INSTANCE -> c
@@ -26542,33 +26787,33 @@
     com.android.tools.r8.ir.analysis.type.ReferenceTypeElement asReferenceType() -> d
     1:1:boolean equals(java.lang.Object):101:101 -> equals
     1:1:int hashCode():106:106 -> hashCode
-com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.vw$a:
+com.android.tools.r8.ir.analysis.type.ReferenceTypeElement$NullElement -> com.android.tools.r8.internal.Ow$a:
     1:1:void <init>(com.android.tools.r8.ir.analysis.type.Nullability):14:14 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ReferenceTypeElement getOrCreateVariant(com.android.tools.r8.ir.analysis.type.Nullability):19:19 -> a
     1:1:boolean equals(java.lang.Object):50:50 -> equals
     1:1:int hashCode():42:42 -> hashCode
     1:1:java.lang.String toString():37:37 -> toString
-com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.Rx:
+com.android.tools.r8.ir.analysis.type.ShortTypeElement -> com.android.tools.r8.internal.ky:
     com.android.tools.r8.ir.analysis.type.ShortTypeElement INSTANCE -> e
     1:1:void <clinit>():8:8 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.ShortTypeElement getInstance():11:11 -> H
     1:1:int hashCode():31:31 -> hashCode
-com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.ay:
+com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement -> com.android.tools.r8.internal.ty:
     com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
     boolean isSinglePrimitive() -> C
     1:1:com.android.tools.r8.ir.analysis.type.SinglePrimitiveTypeElement getInstance():16:16 -> G
     1:1:int hashCode():36:36 -> hashCode
-com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.GA:
+com.android.tools.r8.ir.analysis.type.TopTypeElement -> com.android.tools.r8.internal.ZA:
     com.android.tools.r8.ir.analysis.type.TopTypeElement INSTANCE -> c
     1:1:void <clinit>():7:7 -> <clinit>
     1:1:void <init>():6:6 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.Nullability nullability():11:11 -> E
     1:1:com.android.tools.r8.ir.analysis.type.TopTypeElement getInstance():15:15 -> G
     1:1:int hashCode():35:35 -> hashCode
-com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.xB:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis -> com.android.tools.r8.internal.RB:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode mode -> d
     java.util.Deque worklist -> f
     com.android.tools.r8.graph.AppView appView -> e
@@ -26597,14 +26842,14 @@
     1:4:void widening(com.android.tools.r8.ir.code.IRCode):57:60 -> b
     5:5:boolean verifyValuesUpToDate(java.lang.Iterable):83:83 -> b
     1:1:void widening(java.lang.Iterable):64:64 -> c
-com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.internal.wB:
+com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode -> com.android.tools.r8.internal.QB:
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NO_CHANGE -> d
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode UNSET -> a
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode WIDENING -> b
     com.android.tools.r8.ir.analysis.type.TypeAnalysis$Mode NARROWING -> c
     1:5:void <clinit>():26:30 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.EB:
+com.android.tools.r8.ir.analysis.type.TypeElement -> com.android.tools.r8.internal.YB:
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
     1:1:void <clinit>():16:16 -> <clinit>
@@ -26707,7 +26952,7 @@
     7:7:boolean isPreciseType():332 -> z
     8:8:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isBottom():0:0 -> z
     8:8:boolean isPreciseType():333 -> z
-com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.UC:
+com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement -> com.android.tools.r8.internal.KD:
     com.android.tools.r8.ir.analysis.type.WidePrimitiveTypeElement INSTANCE -> d
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():12:12 -> <init>
@@ -26754,7 +26999,7 @@
     1:1:int hashCode():43:43 -> hashCode
     boolean isNonTrivial() -> k
     1:1:com.android.tools.r8.ir.analysis.value.BottomValue getInstance():18:18 -> q
-com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.k9:
+com.android.tools.r8.ir.analysis.value.EmptyObjectState -> com.android.tools.r8.internal.t9:
     com.android.tools.r8.ir.analysis.value.EmptyObjectState INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -26763,7 +27008,7 @@
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.analysis.value.EmptyObjectState getInstance():19:19 -> c
     1:1:int hashCode():44:44 -> hashCode
-com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.X9:
+com.android.tools.r8.ir.analysis.value.EnumValuesObjectState -> com.android.tools.r8.internal.ga:
     com.android.tools.r8.ir.analysis.value.ObjectState[] state -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -26777,7 +27022,7 @@
     boolean isEmpty() -> b
     1:9:boolean equals(java.lang.Object):63:71 -> equals
     1:1:int hashCode():80:80 -> hashCode
-com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.Zp:
+com.android.tools.r8.ir.analysis.value.NonEmptyObjectState -> com.android.tools.r8.internal.lq:
     java.util.Map state -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():15:15 -> <clinit>
@@ -26788,13 +27033,13 @@
     boolean isEmpty() -> b
     1:11:boolean equals(java.lang.Object):47:57 -> equals
     1:1:int hashCode():66:66 -> hashCode
-com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.Cr:
+com.android.tools.r8.ir.analysis.value.ObjectState -> com.android.tools.r8.internal.Or:
     1:1:void <init>():15:15 -> <init>
     com.android.tools.r8.ir.analysis.value.EnumValuesObjectState asEnumValuesObjectState() -> a
     com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractFieldValue(com.android.tools.r8.graph.DexEncodedField) -> a
     com.android.tools.r8.ir.analysis.value.ObjectState rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     boolean isEmpty() -> b
-com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.Br:
+com.android.tools.r8.ir.analysis.value.ObjectState$Builder -> com.android.tools.r8.internal.Nr:
     java.util.Map state -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():46:46 -> <clinit>
@@ -26804,7 +27049,7 @@
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
     5:5:com.android.tools.r8.ir.analysis.value.ObjectState build():58 -> a
     6:6:com.android.tools.r8.ir.analysis.value.ObjectState build():58:58 -> a
-com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.Vx:
+com.android.tools.r8.ir.analysis.value.SingleConstClassValue -> com.android.tools.r8.internal.oy:
     com.android.tools.r8.graph.DexType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():26:26 -> <clinit>
@@ -26820,16 +27065,16 @@
     402:402:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):78 -> a
     403:403:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):78:78 -> a
     404:406:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):85:87 -> a
-    407:407:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    407:407:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     407:407:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):87 -> a
     408:408:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):89:89 -> a
     409:409:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):21:21 -> a
     409:409:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90 -> a
     410:412:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):90:92 -> a
     413:415:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98:100 -> a
-    416:416:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    416:416:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     416:416:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):100 -> a
-    417:417:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
+    417:417:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> a
     417:417:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101 -> a
     418:420:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):101:103 -> a
     421:421:com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:109 -> a
@@ -26838,10 +27083,10 @@
     1:1:int hashCode():56:56 -> hashCode
     1:1:com.android.tools.r8.graph.DexType getType():46:46 -> q
     1:1:java.lang.String toString():61:61 -> toString
-com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.Wx:
+com.android.tools.r8.ir.analysis.value.SingleConstValue -> com.android.tools.r8.internal.py:
     1:1:void <init>():7:7 -> <init>
     boolean isSingleConstValue() -> m
-com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.Yx:
+com.android.tools.r8.ir.analysis.value.SingleFieldValue -> com.android.tools.r8.internal.ry:
     com.android.tools.r8.graph.DexField field -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():28:28 -> <clinit>
@@ -26850,13 +27095,13 @@
     2:5:com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier):74:77 -> a
     6:7:boolean isMaterializableInContext(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):84:85 -> a
     8:10:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):90:92 -> a
-    11:11:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> a
+    11:11:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():188:188 -> a
     11:11:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):95 -> a
     12:12:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98:98 -> a
-    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     13:13:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):98 -> a
     14:14:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):100:100 -> a
-    15:15:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> a
+    15:15:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> a
     15:15:boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView):103 -> a
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):28:28 -> b
     2:8:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.graph.AppView):43:49 -> b
@@ -26867,7 +27112,7 @@
     boolean isSingleFieldValue() -> n
     1:1:com.android.tools.r8.graph.DexField getField():37:37 -> q
     com.android.tools.r8.ir.analysis.value.ObjectState getState() -> r
-com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.Zx:
+com.android.tools.r8.ir.analysis.value.SingleNumberValue -> com.android.tools.r8.internal.sy:
     long value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
@@ -26888,7 +27133,7 @@
     1:1:int getIntValue():68:68 -> r
     1:1:long getValue():76:76 -> s
     1:1:java.lang.String toString():91:91 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.by:
+com.android.tools.r8.ir.analysis.value.SingleStatefulFieldValue -> com.android.tools.r8.internal.uy:
     boolean $assertionsDisabled -> c
     com.android.tools.r8.ir.analysis.value.ObjectState state -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -26897,14 +27142,14 @@
     1:1:int hashCode():42:42 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():23:23 -> r
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.cy:
+com.android.tools.r8.ir.analysis.value.SingleStatelessFieldValue -> com.android.tools.r8.internal.vy:
     1:1:void <init>(com.android.tools.r8.graph.DexField):13:13 -> <init>
     1:5:boolean equals(java.lang.Object):28:32 -> equals
     1:1:int hashCode():37:37 -> hashCode
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> r
     1:1:com.android.tools.r8.ir.analysis.value.ObjectState getState():18 -> r
     1:1:java.lang.String toString():23:23 -> toString
-com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.dy:
+com.android.tools.r8.ir.analysis.value.SingleStringValue -> com.android.tools.r8.internal.wy:
     com.android.tools.r8.graph.DexString string -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():25:25 -> <clinit>
@@ -26921,7 +27166,7 @@
     1:1:com.android.tools.r8.graph.DexString getDexString():45:45 -> q
     com.android.tools.r8.ir.analysis.value.SingleValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> r
     1:1:java.lang.String toString():60:60 -> toString
-com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.fy:
+com.android.tools.r8.ir.analysis.value.SingleValue -> com.android.tools.r8.internal.yy:
     1:1:void <init>():17:17 -> <init>
     com.android.tools.r8.ir.code.Instruction createMaterializingInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier) -> a
     boolean isMaterializableInAllContexts(com.android.tools.r8.graph.AppView) -> a
@@ -26929,7 +27174,7 @@
     boolean isSingleValue() -> c
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> e
     boolean isNonTrivial() -> k
-com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.bC:
+com.android.tools.r8.ir.analysis.value.UnknownValue -> com.android.tools.r8.internal.wC:
     com.android.tools.r8.ir.analysis.value.UnknownValue INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():15:15 -> <init>
@@ -27351,167 +27596,167 @@
     1:125:void <init>():55:179 -> <init>
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniqueNormalSuccessor():207:208 -> A
     1:2:com.android.tools.r8.ir.code.BasicBlock getUniquePredecessor():270:271 -> B
-    1:2:boolean hasCatchHandlers():597:598 -> C
-    1:1:boolean hasIncompletePhis():1194:1194 -> D
-    1:1:boolean hasOneNormalExit():1561:1561 -> E
-    1:1:boolean hasPhis():568:568 -> F
+    1:2:boolean hasCatchHandlers():599:600 -> C
+    1:1:boolean hasIncompletePhis():1196:1196 -> D
+    1:1:boolean hasOneNormalExit():1563:1563 -> E
+    1:1:boolean hasPhis():570:570 -> F
     1:1:boolean hasUniqueNormalSuccessor():194:194 -> G
     1:1:boolean hasUniquePredecessor():266:266 -> H
     1:1:boolean hasUniqueSuccessor():190:190 -> I
-    1:2:void incrementUnfilledPredecessorCount():729:730 -> J
-    1:1:boolean isEmpty():666:666 -> K
-    1:1:boolean isFilled():589:589 -> L
-    1:1:boolean isReturnBlock():674:674 -> M
-    1:1:boolean isSealed():1182:1182 -> N
-    1:11:boolean isSimpleAlwaysThrowingPath():1538:1548 -> O
-    1:1:boolean isTrivialGoto():1493:1493 -> P
-    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1637:1637 -> Q
+    1:2:void incrementUnfilledPredecessorCount():731:732 -> J
+    1:1:boolean isEmpty():668:668 -> K
+    1:1:boolean isFilled():591:591 -> L
+    1:1:boolean isReturnBlock():676:676 -> M
+    1:1:boolean isSealed():1184:1184 -> N
+    1:11:boolean isSimpleAlwaysThrowingPath():1540:1550 -> O
+    1:1:boolean isTrivialGoto():1495:1495 -> P
+    1:1:com.android.tools.r8.ir.code.InstructionIterator iterator():1639:1639 -> Q
     1:2:boolean notifyPredecessorsMayChangeListeners():284:285 -> R
     1:2:boolean notifySuccessorsMayChangeListeners():221:222 -> S
-    1:1:int numberOfCatchHandlers():1586:1586 -> T
+    1:1:int numberOfCatchHandlers():1588:1588 -> T
     1:2:int numberOfExceptionalSuccessors():259:260 -> U
     1:4:int numberOfNormalSuccessors():252:255 -> V
-    1:2:int numberOfThrowingInstructions():1591:1592 -> W
+    1:2:int numberOfThrowingInstructions():1593:1594 -> W
     1:2:void removeAllNormalSuccessors():331:332 -> X
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> X
     3:3:void removeAllNormalSuccessors():332 -> X
     4:12:void removeAllNormalSuccessors():333:341 -> X
-    1:1:void setFilledForTesting():593:593 -> Y
-    1:1:int size():670:670 -> Z
+    1:1:void setFilledForTesting():595:595 -> Y
+    1:1:int size():672:672 -> Z
     1:3:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):86:86 -> a
     4:4:boolean lambda$verifyTypes$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper,com.android.tools.r8.ir.code.Instruction):87:87 -> a
     5:5:void setLocalsAtEntry(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):92:92 -> a
     6:10:void addControlFlowEdgesMayChangeListener(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):182:186 -> a
     11:29:void removePredecessor(com.android.tools.r8.ir.code.BasicBlock,java.util.Set):307:325 -> a
     30:47:void swapSuccessorsByIndex(int,int):354:371 -> a
-    48:55:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):486:493 -> a
-    56:59:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):497:500 -> a
+    48:55:void replacePredecessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):488:495 -> a
+    56:59:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):499:502 -> a
     60:61:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List) -> a
-    60:61:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):500 -> a
+    60:61:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):502 -> a
     62:63:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):606:606 -> a
     62:63:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.get(int):32 -> a
     62:63:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):61 -> a
-    62:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):500 -> a
+    62:63:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):502 -> a
     64:64:boolean com.android.tools.r8.utils.ListUtils.verifyListIsOrdered(java.util.List):61:61 -> a
-    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):500 -> a
-    65:70:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):500:505 -> a
+    64:64:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):502 -> a
+    65:70:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):502:507 -> a
     71:71:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    71:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):505 -> a
-    72:90:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):505:523 -> a
+    71:71:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):507 -> a
+    72:90:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):507:525 -> a
     91:91:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.iterator():180:180 -> a
-    91:91:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525 -> a
-    92:108:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):525:541 -> a
-    109:110:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):572:573 -> a
-    111:111:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):628:628 -> a
-    112:113:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):705:706 -> a
-    114:116:void clearMark(int):718:720 -> a
-    117:117:void addPhi(com.android.tools.r8.ir.code.Phi):750:750 -> a
-    118:118:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):764:764 -> a
-    119:119:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():589:589 -> a
-    119:119:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):764 -> a
-    120:123:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):764:767 -> a
-    124:124:void close(com.android.tools.r8.ir.conversion.IRBuilder):771:771 -> a
-    125:125:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():589:589 -> a
-    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):771 -> a
-    126:130:void close(com.android.tools.r8.ir.conversion.IRBuilder):771:775 -> a
-    131:132:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1623:1624 -> a
-    131:132:void close(com.android.tools.r8.ir.conversion.IRBuilder):776 -> a
-    133:133:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1641:1641 -> a
-    133:133:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1624 -> a
-    133:133:void close(com.android.tools.r8.ir.conversion.IRBuilder):776 -> a
-    134:139:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1625:1630 -> a
-    134:139:void close(com.android.tools.r8.ir.conversion.IRBuilder):776 -> a
-    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):777:777 -> a
-    141:152:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1141:1152 -> a
-    141:152:void close(com.android.tools.r8.ir.conversion.IRBuilder):778 -> a
-    153:153:boolean blocksClean(java.util.List):790:790 -> a
-    154:163:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):870:879 -> a
-    164:164:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):876:876 -> a
-    165:169:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):905:909 -> a
+    91:91:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):527 -> a
+    92:108:void removeSuccessorsByIndex(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):527:543 -> a
+    109:110:boolean hasDeadPhi(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):574:575 -> a
+    111:111:java.lang.Iterable instructionsAfter(com.android.tools.r8.ir.code.Instruction):630:630 -> a
+    112:113:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):707:708 -> a
+    114:116:void clearMark(int):720:722 -> a
+    117:117:void addPhi(com.android.tools.r8.ir.code.Phi):752:752 -> a
+    118:118:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):766:766 -> a
+    119:119:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():591:591 -> a
+    119:119:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):766 -> a
+    120:123:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRMetadata):766:769 -> a
+    124:124:void close(com.android.tools.r8.ir.conversion.IRBuilder):773:773 -> a
+    125:125:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():591:591 -> a
+    125:125:void close(com.android.tools.r8.ir.conversion.IRBuilder):773 -> a
+    126:130:void close(com.android.tools.r8.ir.conversion.IRBuilder):773:777 -> a
+    131:132:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1625:1626 -> a
+    131:132:void close(com.android.tools.r8.ir.conversion.IRBuilder):778 -> a
+    133:133:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1643:1643 -> a
+    133:133:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1626 -> a
+    133:133:void close(com.android.tools.r8.ir.conversion.IRBuilder):778 -> a
+    134:139:boolean com.android.tools.r8.ir.code.BasicBlock.verifyNoValuesAfterThrowingInstruction():1627:1632 -> a
+    134:139:void close(com.android.tools.r8.ir.conversion.IRBuilder):778 -> a
+    140:140:void close(com.android.tools.r8.ir.conversion.IRBuilder):779:779 -> a
+    141:152:void com.android.tools.r8.ir.code.BasicBlock.filledPredecessor(com.android.tools.r8.ir.conversion.IRBuilder):1143:1154 -> a
+    141:152:void close(com.android.tools.r8.ir.conversion.IRBuilder):780 -> a
+    153:153:boolean blocksClean(java.util.List):792:792 -> a
+    154:163:void removeCatchHandlerWithGuard(com.android.tools.r8.graph.DexType):872:881 -> a
+    164:164:boolean lambda$removeCatchHandlerWithGuard$6(int,com.android.tools.r8.ir.code.BasicBlock):878:878 -> a
+    165:169:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):907:911 -> a
     170:170:java.util.List com.android.tools.r8.ir.code.DominatorTree.dominatedBlocks(com.android.tools.r8.ir.code.BasicBlock):171:171 -> a
-    170:170:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):910 -> a
-    171:175:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):910:914 -> a
-    176:185:void linkCatchSuccessors(java.util.List,java.util.List):953:962 -> a
-    186:217:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):966:997 -> a
-    218:228:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1008:1018 -> a
-    229:230:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1068:1069 -> a
-    229:230:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1075 -> a
-    231:249:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1106:1124 -> a
-    250:254:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1131:1135 -> a
-    255:258:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1134:1137 -> a
-    259:263:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1186:1190 -> a
-    264:271:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1203:1210 -> a
-    272:304:void print(com.android.tools.r8.utils.CfgPrinter):1309:1341 -> a
-    305:306:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1345:1346 -> a
-    307:308:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1404:1405 -> a
-    309:313:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1418:1422 -> a
-    314:320:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1453:1459 -> a
-    321:330:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1475:1484 -> a
-    331:331:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):760:760 -> a
-    331:331:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1485 -> a
-    332:332:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):760:760 -> a
-    332:332:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1486 -> a
-    333:333:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1487:1487 -> a
-    334:334:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    334:334:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1488 -> a
-    335:335:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1488:1488 -> a
-    336:337:boolean canThrow():1600:1601 -> a
-    338:338:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1649:1649 -> a
-    339:339:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1653:1653 -> a
-    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1649 -> a
-    340:340:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1653:1653 -> a
-    341:341:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1657:1657 -> a
-    342:342:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1668:1668 -> a
-    343:354:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1686:1697 -> a
-    355:360:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1718:1723 -> a
-    355:360:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1701 -> a
-    361:365:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1705:1709 -> a
-    366:382:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1734:1750 -> a
-    383:384:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1769:1770 -> a
-    383:384:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
+    170:170:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):912 -> a
+    171:175:java.util.List unlink(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):912:916 -> a
+    176:185:void linkCatchSuccessors(java.util.List,java.util.List):955:964 -> a
+    186:217:void appendCatchHandler(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType):968:999 -> a
+    218:228:boolean renameGuardsInCatchHandlers(com.android.tools.r8.graph.GraphLens):1010:1020 -> a
+    229:230:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1070:1071 -> a
+    229:230:boolean isOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1077 -> a
+    231:249:void updateCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1108:1126 -> a
+    250:254:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1133:1137 -> a
+    255:258:void writeCurrentDefinition(int,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo):1136:1139 -> a
+    259:263:void addIncompletePhi(int,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1188:1192 -> a
+    264:271:void appendBasicBlockList(java.lang.StringBuilder,java.util.List,java.util.function.Function):1205:1212 -> a
+    272:304:void print(com.android.tools.r8.utils.CfgPrinter):1311:1343 -> a
+    305:306:void printBlockList(com.android.tools.r8.utils.CfgPrinter,java.util.List):1347:1348 -> a
+    307:308:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):1406:1407 -> a
+    309:313:com.android.tools.r8.ir.code.BasicBlock createGotoBlock(int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRMetadata):1420:1424 -> a
+    314:320:com.android.tools.r8.ir.code.BasicBlock createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.Instruction[]):1455:1461 -> a
+    321:330:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1477:1486 -> a
+    331:331:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):762:762 -> a
+    331:331:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1487 -> a
+    332:332:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):762:762 -> a
+    332:332:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1488 -> a
+    333:333:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1489:1489 -> a
+    334:334:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    334:334:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1490 -> a
+    335:335:com.android.tools.r8.ir.code.BasicBlock createRethrowBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):1490:1490 -> a
+    336:337:boolean canThrow():1602:1603 -> a
+    338:338:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1651:1651 -> a
+    339:339:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.BasicBlock.listIterator(com.android.tools.r8.ir.code.IRMetadata):1655:1655 -> a
+    339:339:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode):1651 -> a
+    340:340:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRMetadata):1655:1655 -> a
+    341:341:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,int):1659:1659 -> a
+    342:342:com.android.tools.r8.ir.code.InstructionListIterator listIterator(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):1670:1670 -> a
+    343:354:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1688:1699 -> a
+    355:360:void com.android.tools.r8.ir.code.BasicBlock.moveCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1720:1725 -> a
+    355:360:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1703 -> a
+    361:365:com.android.tools.r8.ir.code.BasicBlock createSplitBlock(int,boolean):1707:1711 -> a
+    366:382:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1736:1752 -> a
+    383:384:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1771:1772 -> a
+    383:384:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
     385:385:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    385:385:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1770 -> a
-    385:385:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    386:403:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1774:1791 -> a
-    386:403:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    404:404:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    404:404:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1792 -> a
-    404:404:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    405:411:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1792:1798 -> a
-    405:411:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    412:412:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):760:760 -> a
-    412:412:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1799 -> a
-    412:412:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    413:416:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1800:1803 -> a
-    413:416:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    417:417:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):760:760 -> a
-    417:417:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1804 -> a
-    417:417:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    418:423:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1805:1810 -> a
-    418:423:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    424:424:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1788:1788 -> a
-    424:424:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
+    385:385:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1772 -> a
+    385:385:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    386:403:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1776:1793 -> a
+    386:403:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    404:404:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    404:404:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1794 -> a
+    404:404:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    405:411:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1794:1800 -> a
+    405:411:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    412:412:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):762:762 -> a
+    412:412:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1801 -> a
+    412:412:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    413:416:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1802:1805 -> a
+    413:416:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    417:417:void com.android.tools.r8.ir.code.BasicBlock.add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):762:762 -> a
+    417:417:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1806 -> a
+    417:417:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    418:423:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1807:1812 -> a
+    418:423:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    424:424:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1790:1790 -> a
+    424:424:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
     425:425:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    425:425:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1788 -> a
-    425:425:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    426:460:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1788:1822 -> a
-    426:460:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
+    425:425:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1790 -> a
+    425:425:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    426:460:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1790:1824 -> a
+    426:460:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
     461:461:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):143:143 -> a
-    461:461:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1824 -> a
-    461:461:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    462:462:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1825:1825 -> a
-    462:462:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1750 -> a
-    463:536:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1841:1914 -> a
-    1:9:java.lang.String toDetailedString():1235:1243 -> a0
-    10:10:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():589:589 -> a0
-    10:10:java.lang.String toDetailedString():1243 -> a0
-    11:12:java.lang.String toDetailedString():1243:1244 -> a0
-    13:13:boolean com.android.tools.r8.ir.code.BasicBlock.isSealed():1182:1182 -> a0
-    13:13:java.lang.String toDetailedString():1244 -> a0
-    14:51:java.lang.String toDetailedString():1244:1281 -> a0
-    52:52:int com.android.tools.r8.ir.code.BasicBlock.digits(int):1231:1231 -> a0
-    52:52:java.lang.String toDetailedString():1281 -> a0
-    53:77:java.lang.String toDetailedString():1281:1305 -> a0
+    461:461:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1826 -> a
+    461:461:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    462:462:void com.android.tools.r8.ir.code.BasicBlock.splitCriticalExceptionEdges(com.android.tools.r8.ir.code.IRCode,java.util.function.Consumer,com.android.tools.r8.utils.InternalOptions):1827:1827 -> a
+    462:462:void copyCatchHandlers(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.InternalOptions):1752 -> a
+    463:536:java.util.List appendCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1843:1916 -> a
+    1:9:java.lang.String toDetailedString():1237:1245 -> a0
+    10:10:boolean com.android.tools.r8.ir.code.BasicBlock.isFilled():591:591 -> a0
+    10:10:java.lang.String toDetailedString():1245 -> a0
+    11:12:java.lang.String toDetailedString():1245:1246 -> a0
+    13:13:boolean com.android.tools.r8.ir.code.BasicBlock.isSealed():1184:1184 -> a0
+    13:13:java.lang.String toDetailedString():1246 -> a0
+    14:51:java.lang.String toDetailedString():1246:1283 -> a0
+    52:52:int com.android.tools.r8.ir.code.BasicBlock.digits(int):1233:1233 -> a0
+    52:52:java.lang.String toDetailedString():1283 -> a0
+    53:77:java.lang.String toDetailedString():1283:1307 -> a0
     1:1:void lambda$notifyPredecessorsMayChangeListeners$2(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):285:285 -> b
     2:32:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):376:406 -> b
     33:33:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> b
@@ -27521,93 +27766,93 @@
     35:35:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):409 -> b
     36:38:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):409:411 -> b
     39:39:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> b
-    39:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):411 -> b
-    40:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):411:412 -> b
-    42:46:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):473:477 -> b
-    42:46:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):412 -> b
-    47:99:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):412:464 -> b
-    100:100:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):632:632 -> b
-    101:102:void decrementUnfilledPredecessorCount(int):734:735 -> b
-    103:104:void removePhi(com.android.tools.r8.ir.code.Phi):754:755 -> b
-    105:105:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):858:858 -> b
-    106:110:boolean com.android.tools.r8.ir.code.BasicBlock.isCatchHandlerForSingleGuard():884:888 -> b
-    106:110:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):859 -> b
-    111:115:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):861:865 -> b
-    116:143:java.util.Set cleanForRemoval():919:946 -> b
-    144:145:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1068:1069 -> b
-    144:145:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1081 -> b
-    146:148:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1083:1085 -> b
-    149:150:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1157:1158 -> b
-    151:163:void removeInstructions(java.util.List):1367:1379 -> b
-    164:164:void com.android.tools.r8.ir.code.BasicBlock.setInstructions(java.util.LinkedList):1359:1359 -> b
-    164:164:void removeInstructions(java.util.List):1380 -> b
-    1:3:void unlinkCatchHandler():843:845 -> b0
+    39:39:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):412 -> b
+    40:41:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):412:413 -> b
+    42:46:boolean com.android.tools.r8.ir.code.BasicBlock.hasLinearFlow(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):475:479 -> b
+    42:46:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):413 -> b
+    47:100:void replaceSuccessor(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):413:466 -> b
+    101:101:java.lang.Iterable instructionsBefore(com.android.tools.r8.ir.code.Instruction):634:634 -> b
+    102:103:void decrementUnfilledPredecessorCount(int):736:737 -> b
+    104:105:void removePhi(com.android.tools.r8.ir.code.Phi):756:757 -> b
+    106:106:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):860:860 -> b
+    107:111:boolean com.android.tools.r8.ir.code.BasicBlock.isCatchHandlerForSingleGuard():886:890 -> b
+    107:111:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):861 -> b
+    112:116:void unlinkCatchHandlerForGuard(com.android.tools.r8.graph.DexType):863:867 -> b
+    117:144:java.util.Set cleanForRemoval():921:948 -> b
+    145:146:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.BasicBlock.readOnThrowValue(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1070:1071 -> b
+    145:146:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1083 -> b
+    147:149:com.android.tools.r8.ir.code.Value readCurrentDefinition(int,com.android.tools.r8.ir.code.BasicBlock$EdgeType):1085:1087 -> b
+    150:151:com.android.tools.r8.ir.code.BasicBlock$EdgeType getEdgeType(com.android.tools.r8.ir.code.BasicBlock):1159:1160 -> b
+    152:164:void removeInstructions(java.util.List):1369:1381 -> b
+    165:165:void com.android.tools.r8.ir.code.BasicBlock.setInstructions(java.util.LinkedList):1361:1361 -> b
+    165:165:void removeInstructions(java.util.List):1382 -> b
+    1:3:void unlinkCatchHandler():845:847 -> b0
     1:1:void lambda$notifySuccessorsMayChangeListeners$1(com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener):222:222 -> c
     2:6:void swapSuccessors(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):346:350 -> c
-    7:8:void removePhisByIndex(java.util.List):562:563 -> c
-    9:10:boolean isMarked(int):724:725 -> c
-    11:14:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1162:1165 -> c
-    15:15:void clearCatchHandlers():1577:1577 -> c
-    16:16:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1645:1645 -> c
-    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():804:808 -> c0
+    7:8:void removePhisByIndex(java.util.List):564:565 -> c
+    9:10:boolean isMarked(int):726:727 -> c
+    11:14:boolean hasCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1164:1167 -> c
+    15:15:void clearCatchHandlers():1579:1579 -> c
+    16:16:com.android.tools.r8.ir.code.InstructionIterator iterator(com.android.tools.r8.ir.code.Instruction):1647:1647 -> c
+    1:5:com.android.tools.r8.ir.code.BasicBlock unlinkSinglePredecessor():806:810 -> c0
     1:2:boolean hasNormalSuccessor(com.android.tools.r8.ir.code.BasicBlock):234:235 -> d
-    3:5:void clearCurrentDefinitions():1054:1056 -> d
-    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1641:1641 -> d
-    7:7:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1645:1645 -> d
-    7:7:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):628 -> d
-    1:5:void unlinkSinglePredecessorSiblingsAllowed():814:818 -> d0
-    1:1:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):633:633 -> e
-    2:3:void clearUserInfo():700:701 -> e
-    4:7:void mark(int):711:714 -> e
-    8:9:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):792:793 -> e
-    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():827:832 -> e0
+    3:5:void clearCurrentDefinitions():1056:1058 -> d
+    6:6:com.android.tools.r8.ir.code.InstructionIterator iterator(int):1643:1643 -> d
+    7:7:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(com.android.tools.r8.ir.code.Instruction):1647:1647 -> d
+    7:7:java.util.Iterator lambda$instructionsAfter$3(com.android.tools.r8.ir.code.Instruction):630 -> d
+    1:5:void unlinkSinglePredecessorSiblingsAllowed():816:820 -> d0
+    1:1:java.util.Iterator lambda$instructionsBefore$4(com.android.tools.r8.ir.code.Instruction):635:635 -> e
+    2:3:void clearUserInfo():702:703 -> e
+    4:7:void mark(int):713:716 -> e
+    8:9:void lambda$blocksClean$5(com.android.tools.r8.ir.code.BasicBlock):794:795 -> e
+    1:6:com.android.tools.r8.ir.code.BasicBlock unlinkSingleSuccessor():829:834 -> e0
     java.lang.String lambda$toDetailedString$7(com.android.tools.r8.ir.code.BasicBlock) -> f
-    1:2:int numberInstructions(int):616:617 -> f
-    3:4:boolean consistentCatchHandlers():1025:1026 -> f
-    5:5:com.android.tools.r8.ir.code.CatchHandlers com.android.tools.r8.ir.code.BasicBlock.getCatchHandlersWithSuccessorIndexes():1573:1573 -> f
-    5:5:boolean consistentCatchHandlers():1027 -> f
-    6:8:boolean consistentCatchHandlers():1029:1029 -> f
-    11:27:boolean consistentCatchHandlers():1032:1048 -> f
-    28:30:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1388:1390 -> f
-    1:2:boolean verifyFilledPredecessors():744:745 -> f0
+    1:2:int numberInstructions(int):618:619 -> f
+    3:4:boolean consistentCatchHandlers():1027:1028 -> f
+    5:5:com.android.tools.r8.ir.code.CatchHandlers com.android.tools.r8.ir.code.BasicBlock.getCatchHandlersWithSuccessorIndexes():1575:1575 -> f
+    5:5:boolean consistentCatchHandlers():1029 -> f
+    6:8:boolean consistentCatchHandlers():1031:1031 -> f
+    11:27:boolean consistentCatchHandlers():1034:1050 -> f
+    28:30:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1390:1392 -> f
+    1:2:boolean verifyFilledPredecessors():746:747 -> f0
     int onThrowValueRegister(int) -> g
-    1:2:void decrementUnfilledPredecessorCount():739:740 -> g
-    3:6:void link(com.android.tools.r8.ir.code.BasicBlock):783:786 -> g
-    1:2:void setNumber(int):607:608 -> h
-    3:4:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1224:1225 -> h
-    5:13:int com.android.tools.r8.ir.code.BasicBlock.guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1169:1177 -> h
-    5:13:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1225 -> h
-    14:14:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1225:1225 -> h
-    15:49:void deduplicatePhis():1967:2001 -> h
+    1:2:void decrementUnfilledPredecessorCount():741:742 -> g
+    3:6:void link(com.android.tools.r8.ir.code.BasicBlock):785:788 -> g
+    1:2:void setNumber(int):609:610 -> h
+    3:4:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1226:1227 -> h
+    5:13:int com.android.tools.r8.ir.code.BasicBlock.guardsForCatchSuccessor(com.android.tools.r8.ir.code.BasicBlock):1171:1179 -> h
+    5:13:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1227 -> h
+    14:14:java.lang.String predecessorPostfix(com.android.tools.r8.ir.code.BasicBlock):1227:1227 -> h
+    15:49:void deduplicatePhis():1969:2003 -> h
     1:3:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):301:303 -> i
     4:4:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>(int[]):135:135 -> i
     4:4:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):303 -> i
     5:5:void removeSuccessor(com.android.tools.r8.ir.code.BasicBlock):303:303 -> i
-    6:9:void detachAllSuccessors():897:900 -> i
-    10:11:boolean verifyOnThrowWrite(int):1613:1614 -> i
-    1:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1521:1523 -> j
-    4:5:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1581:1582 -> j
-    1:1:com.android.tools.r8.ir.code.Instruction entry():678:678 -> k
-    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():688:689 -> l
-    3:3:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1641:1641 -> l
-    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():689 -> l
-    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():690:692 -> l
-    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():682:684 -> m
-    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1565:1569 -> n
-    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1573:1573 -> o
-    1:1:java.util.LinkedList getInstructions():624:624 -> p
+    6:9:void detachAllSuccessors():899:902 -> i
+    10:11:boolean verifyOnThrowWrite(int):1615:1616 -> i
+    1:3:com.android.tools.r8.ir.code.BasicBlock endOfGotoChain():1523:1525 -> j
+    4:5:void transferCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):1583:1584 -> j
+    1:1:com.android.tools.r8.ir.code.Instruction entry():680:680 -> k
+    1:2:com.android.tools.r8.ir.code.Instruction exceptionalExit():690:691 -> l
+    3:3:com.android.tools.r8.ir.code.InstructionIterator com.android.tools.r8.ir.code.BasicBlock.iterator(int):1643:1643 -> l
+    3:3:com.android.tools.r8.ir.code.Instruction exceptionalExit():691 -> l
+    4:6:com.android.tools.r8.ir.code.Instruction exceptionalExit():692:694 -> l
+    1:3:com.android.tools.r8.ir.code.JumpInstruction exit():684:686 -> m
+    1:5:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlers():1567:1571 -> n
+    1:1:com.android.tools.r8.ir.code.CatchHandlers getCatchHandlersWithSuccessorIndexes():1575:1575 -> o
+    1:1:java.util.LinkedList getInstructions():626:626 -> p
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getLocalsAtEntry():96:96 -> q
     1:2:java.util.List getMutablePredecessors():279:280 -> r
     1:2:java.util.List getMutableSuccessors():216:217 -> s
     1:7:java.util.List getNormalPredecessors():291:297 -> t
-    1:1:java.lang.String toString():1216:1216 -> toString
+    1:1:java.lang.String toString():1218:1218 -> toString
     1:5:java.util.List getNormalSuccessors():243:247 -> u
     6:7:void com.android.tools.r8.ir.code.BasicBlock.forEachNormalSuccessor(java.util.function.Consumer):228:229 -> u
     6:7:java.util.List getNormalSuccessors():247 -> u
     8:8:java.util.List getNormalSuccessors():248:248 -> u
-    1:2:int getNumber():602:603 -> v
-    1:1:java.lang.String getNumberAsString():612:612 -> w
-    1:1:java.util.List getPhis():581:581 -> x
+    1:2:int getNumber():604:605 -> v
+    1:1:java.lang.String getNumberAsString():614:614 -> w
+    1:1:java.util.List getPhis():583:583 -> x
     1:1:java.util.List getPredecessors():275:275 -> y
     1:1:java.util.List getSuccessors():212:212 -> z
 com.android.tools.r8.ir.code.BasicBlock$1 -> com.android.tools.r8.internal.W1$a:
@@ -27615,13 +27860,13 @@
     com.android.tools.r8.ir.code.Instruction val$instruction -> c
     com.android.tools.r8.ir.code.BasicBlock this$0 -> d
     com.android.tools.r8.ir.code.InstructionIterator iterator -> a
-    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):633:636 -> <init>
-    1:1:boolean hasNext():650:650 -> hasNext
-    1:3:com.android.tools.r8.ir.code.Instruction advance():639:641 -> l
-    1:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():655:659 -> next
-    1:5:java.lang.Object next():633 -> next
-    6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():657:657 -> next
-    6:6:java.lang.Object next():633 -> next
+    1:4:void <init>(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):635:638 -> <init>
+    1:1:boolean hasNext():652:652 -> hasNext
+    1:3:com.android.tools.r8.ir.code.Instruction advance():641:643 -> l
+    1:5:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():657:661 -> next
+    1:5:java.lang.Object next():635 -> next
+    6:6:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlock$1.next():659:659 -> next
+    6:6:java.lang.Object next():635 -> next
 com.android.tools.r8.ir.code.BasicBlock$BasicBlockChangeListener -> com.android.tools.r8.internal.W1$b:
 com.android.tools.r8.ir.code.BasicBlock$EdgeType -> com.android.tools.r8.internal.W1$c:
     com.android.tools.r8.ir.code.BasicBlock$EdgeType NORMAL -> b
@@ -27631,21 +27876,21 @@
     1:1:void <init>(java.lang.String,int):114:114 -> <init>
 com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence -> com.android.tools.r8.internal.W1$d:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():1944:1944 -> <clinit>
-    1:1:void <init>():1944:1944 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1944:1944 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1944:1944 -> a
-    2:4:boolean com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1947:1949 -> a
-    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1944 -> a
-    5:5:int doHash(java.lang.Object):1944:1944 -> a
-    6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):1959:1960 -> a
-    6:7:int doHash(java.lang.Object):1944 -> a
+    1:1:void <clinit>():1946:1946 -> <clinit>
+    1:1:void <init>():1946:1946 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.BasicBlock$1):1946:1946 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):1946:1946 -> a
+    2:4:boolean com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doEquivalent(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Phi):1949:1951 -> a
+    2:4:boolean doEquivalent(java.lang.Object,java.lang.Object):1946 -> a
+    5:5:int doHash(java.lang.Object):1946:1946 -> a
+    6:7:int com.android.tools.r8.ir.code.BasicBlock$PhiEquivalence.doHash(com.android.tools.r8.ir.code.Phi):1961:1962 -> a
+    6:7:int doHash(java.lang.Object):1946 -> a
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo -> com.android.tools.r8.internal.W1$e:
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo CAN_THROW -> b
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo NO_THROW -> a
     1:2:void <clinit>():106:107 -> <clinit>
     1:1:void <init>(java.lang.String,int):105:105 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):110 -> a
     2:2:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo defaultForConstString(com.android.tools.r8.utils.InternalOptions):110:110 -> a
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.Y1:
@@ -27666,154 +27911,158 @@
     com.android.tools.r8.ir.code.BasicBlock block -> b
     com.android.tools.r8.ir.code.IRMetadata metadata -> f
     com.android.tools.r8.ir.code.Position position -> e
-    1:1:void <clinit>():31:31 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):40:40 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):36:43 -> <init>
-    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):46:46 -> <init>
-    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):36:49 -> <init>
-    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):54:55 -> <init>
+    1:1:void <clinit>():33:33 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):42:42 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock):38:45 -> <init>
+    10:10:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):48:48 -> <init>
+    11:24:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,int):38:51 -> <init>
+    25:26:void <init>(com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):56:57 -> <init>
     1:1:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):0:0 -> a
-    1:1:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):241 -> a
-    2:3:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1142:1143 -> a
-    2:3:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1137 -> a
-    2:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):241 -> a
-    4:4:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):244:244 -> a
-    5:8:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):243:246 -> a
+    1:1:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):243 -> a
+    2:3:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DebugLocalInfo):1139:1140 -> a
+    2:3:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.IRCode.createStringConstant(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):1134 -> a
+    2:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):243 -> a
+    4:4:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):246:246 -> a
+    5:8:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):245:248 -> a
     boolean lambda$inlineInvoke$2(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
     boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    9:9:void setInsertionPosition(com.android.tools.r8.ir.code.Position):97:97 -> a
-    10:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):197:197 -> a
+    9:9:void setInsertionPosition(com.android.tools.r8.ir.code.Position):99:99 -> a
+    10:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):199:199 -> a
     11:11:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):200 -> a
-    12:30:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):200:218 -> a
-    31:31:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):198:198 -> a
-    32:36:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):251:255 -> a
-    37:37:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    37:37:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):255 -> a
-    38:41:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):255:258 -> a
-    42:42:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    42:42:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):259 -> a
-    43:43:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):252:252 -> a
-    44:52:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):265:273 -> a
-    53:53:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    53:53:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):274 -> a
-    54:55:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):277:278 -> a
-    56:56:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):266:266 -> a
-    57:77:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):289:309 -> a
-    78:78:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():60:60 -> a
-    78:78:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):314 -> a
-    79:85:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):314:320 -> a
-    86:86:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):319:319 -> a
-    87:110:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):318:341 -> a
-    111:111:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():92:92 -> a
-    111:111:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):342 -> a
-    112:146:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):343:377 -> a
-    147:147:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):290:290 -> a
-    148:157:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):361:370 -> a
-    158:159:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):385:386 -> a
-    160:160:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():60:60 -> a
-    160:160:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):389 -> a
-    161:164:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):389:392 -> a
-    165:165:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
-    165:165:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):392 -> a
-    166:166:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):396:396 -> a
-    167:167:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    167:167:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):396 -> a
-    168:171:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):396:399 -> a
-    172:173:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    172:173:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):399 -> a
-    174:192:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):400:418 -> a
-    193:200:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):427:434 -> a
-    201:233:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):460:492 -> a
-    234:239:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):530:535 -> a
-    240:247:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):546:553 -> a
-    248:250:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):552:554 -> a
-    251:253:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):440:442 -> a
-    251:253:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):556 -> a
-    254:270:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):560:576 -> a
-    271:271:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    271:271:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):577 -> a
-    272:279:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):577:584 -> a
-    280:280:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    280:280:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):587 -> a
-    281:284:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):587:590 -> a
-    285:285:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    285:285:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):591 -> a
-    286:318:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):591:623 -> a
-    319:319:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    319:319:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):627 -> a
-    320:324:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):627:631 -> a
-    325:325:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
-    325:325:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):632 -> a
-    326:333:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):632:639 -> a
-    334:334:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    334:334:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):639 -> a
-    335:354:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):639:658 -> a
-    355:355:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    355:355:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):658 -> a
-    356:356:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):661:661 -> a
-    357:357:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
-    357:357:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):660 -> a
-    358:391:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):659:692 -> a
-    392:392:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1042:1042 -> a
-    392:392:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):692 -> a
-    393:399:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):695:701 -> a
-    400:400:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    400:400:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):702 -> a
-    401:406:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):702:707 -> a
-    407:423:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):507:523 -> a
-    407:423:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):708 -> a
-    424:429:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):715:720 -> a
-    430:430:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    430:430:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):720 -> a
-    431:441:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):720:730 -> a
-    442:446:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):729:733 -> a
-    447:453:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):739:745 -> a
-    454:454:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    454:454:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):746 -> a
-    455:476:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):746:767 -> a
-    477:477:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):143:143 -> a
-    477:477:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):770 -> a
-    478:478:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):771:771 -> a
-    479:479:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    479:479:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):771 -> a
-    480:497:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):771:788 -> a
-    498:498:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1109:1109 -> a
-    498:498:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):224 -> a
-    499:499:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():92:92 -> a
-    499:499:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):226 -> a
-    500:501:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):228:229 -> a
-    502:502:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
-    502:502:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):229 -> a
-    503:508:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):231:236 -> a
-    1:1:void add(java.lang.Object):31:31 -> add
-    1:7:void add(com.android.tools.r8.ir.code.Instruction):115:121 -> b
-    1:1:void unsetInsertionPosition():102:102 -> g
-    1:7:void removeOrReplaceByDebugLocalRead():185:191 -> h
-    8:8:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> h
-    8:8:void removeOrReplaceByDebugLocalRead():191 -> h
-    9:9:void removeOrReplaceByDebugLocalRead():186:186 -> h
-    1:1:boolean hasNext():60:60 -> hasNext
-    1:1:boolean hasPrevious():76:76 -> hasPrevious
-    1:5:void removeInstructionIgnoreOutValue():176:180 -> k
-    6:6:void removeInstructionIgnoreOutValue():177:177 -> k
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():65:65 -> next
-    1:1:java.lang.Object next():31 -> next
-    1:1:int nextIndex():71:71 -> nextIndex
-    1:1:java.lang.Object previous():31:31 -> previous
-    2:2:com.android.tools.r8.ir.code.Instruction previous():81:81 -> previous
-    1:1:int previousIndex():87:87 -> previousIndex
-    1:6:void remove():151:156 -> remove
+    11:11:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):202 -> a
+    12:30:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):202:220 -> a
+    31:31:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):200:200 -> a
+    32:36:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):254:258 -> a
+    37:422:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):0:385 -> a
+    37:422:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):258 -> a
+    423:424:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):259:260 -> a
+    425:425:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    425:425:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):261 -> a
+    426:426:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):255:255 -> a
+    427:431:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):266:270 -> a
+    432:432:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    432:432:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):270 -> a
+    433:436:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):270:273 -> a
+    437:437:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    437:437:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):274 -> a
+    438:438:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):267:267 -> a
+    439:447:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):280:288 -> a
+    448:448:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    448:448:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):289 -> a
+    449:450:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):292:293 -> a
+    451:451:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):281:281 -> a
+    452:472:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):304:324 -> a
+    473:473:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():62:62 -> a
+    473:473:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):329 -> a
+    474:480:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):329:335 -> a
+    481:481:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):334:334 -> a
+    482:505:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):333:356 -> a
+    506:506:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():94:94 -> a
+    506:506:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):357 -> a
+    507:541:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):358:392 -> a
+    542:542:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):305:305 -> a
+    543:552:void lambda$replaceCurrentInstructionWithThrowNull$1(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.BasicBlock):376:385 -> a
+    553:554:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):400:401 -> a
+    555:555:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasNext():62:62 -> a
+    555:555:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):404 -> a
+    556:559:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):404:407 -> a
+    560:560:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
+    560:560:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):407 -> a
+    561:561:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):411:411 -> a
+    562:562:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    562:562:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):411 -> a
+    563:566:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):411:414 -> a
+    567:568:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    567:568:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):414 -> a
+    569:587:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):415:433 -> a
+    588:595:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):442:449 -> a
+    596:628:void splitBlockAndCopyCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.ListIterator):475:507 -> a
+    629:634:void removeArgumentInstruction(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value):545:550 -> a
+    635:642:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):561:568 -> a
+    643:645:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):567:569 -> a
+    646:648:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.canThrow(com.android.tools.r8.ir.code.IRCode):455:457 -> a
+    646:648:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):571 -> a
+    649:665:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):575:591 -> a
+    666:666:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    666:666:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):592 -> a
+    667:674:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):592:599 -> a
+    675:675:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    675:675:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):602 -> a
+    676:712:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):602:638 -> a
+    713:713:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    713:713:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):642 -> a
+    714:718:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):642:646 -> a
+    719:719:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> a
+    719:719:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):647 -> a
+    720:727:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):647:654 -> a
+    728:728:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    728:728:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):654 -> a
+    729:748:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):654:673 -> a
+    749:749:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    749:749:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):673 -> a
+    750:750:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):676:676 -> a
+    751:751:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
+    751:751:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):675 -> a
+    752:785:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):674:707 -> a
+    786:786:com.android.tools.r8.ir.code.BasicBlockIterator com.android.tools.r8.ir.code.IRCode.listIterator(int):1042:1042 -> a
+    786:786:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):707 -> a
+    787:793:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):710:716 -> a
+    794:794:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    794:794:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):717 -> a
+    795:800:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):717:722 -> a
+    801:817:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.appendCatchHandlers(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):522:538 -> a
+    801:817:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):723 -> a
+    818:823:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):730:735 -> a
+    824:824:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    824:824:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):735 -> a
+    825:835:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):735:745 -> a
+    836:840:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):744:748 -> a
+    841:847:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):754:760 -> a
+    848:848:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    848:848:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):761 -> a
+    849:870:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):761:782 -> a
+    871:871:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):143:143 -> a
+    871:871:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):785 -> a
+    872:872:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):786:786 -> a
+    873:873:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    873:873:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):786 -> a
+    874:891:com.android.tools.r8.ir.code.InstructionListIterator ensureSingleReturnInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.List):786:803 -> a
+    892:892:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1106:1106 -> a
+    892:892:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):226 -> a
+    893:893:boolean com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.hasInsertionPosition():94:94 -> a
+    893:893:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):228 -> a
+    894:895:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):230:231 -> a
+    896:896:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
+    896:896:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):231 -> a
+    897:902:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):233:238 -> a
+    1:1:void add(java.lang.Object):33:33 -> add
+    1:7:void add(com.android.tools.r8.ir.code.Instruction):117:123 -> c
+    1:1:void unsetInsertionPosition():104:104 -> g
+    1:7:void removeOrReplaceByDebugLocalRead():187:193 -> h
+    8:8:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> h
+    8:8:void removeOrReplaceByDebugLocalRead():193 -> h
+    9:9:void removeOrReplaceByDebugLocalRead():188:188 -> h
+    1:1:boolean hasNext():62:62 -> hasNext
+    1:1:boolean hasPrevious():78:78 -> hasPrevious
+    1:5:void removeInstructionIgnoreOutValue():178:182 -> k
+    6:6:void removeInstructionIgnoreOutValue():179:179 -> k
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.next():67:67 -> next
+    1:1:java.lang.Object next():33 -> next
+    1:1:int nextIndex():73:73 -> nextIndex
+    1:1:java.lang.Object previous():33:33 -> previous
+    2:2:com.android.tools.r8.ir.code.Instruction previous():83:83 -> previous
+    1:1:int previousIndex():89:89 -> previousIndex
+    1:6:void remove():153:158 -> remove
     7:7:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> remove
-    7:7:void remove():156 -> remove
-    8:9:void remove():156:157 -> remove
+    7:7:void remove():158 -> remove
+    8:9:void remove():158:159 -> remove
     10:10:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> remove
-    10:10:void remove():157 -> remove
-    11:25:void remove():157:171 -> remove
-    26:26:void remove():152:152 -> remove
-    1:1:void set(java.lang.Object):31:31 -> set
-    2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):134:137 -> set
-    2:5:void set(java.lang.Object):31 -> set
+    10:10:void remove():159 -> remove
+    11:25:void remove():159:173 -> remove
+    26:26:void remove():154:154 -> remove
+    1:1:void set(java.lang.Object):33:33 -> set
+    2:5:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):136:139 -> set
+    2:5:void set(java.lang.Object):33 -> set
 com.android.tools.r8.ir.code.BasicBlockIterator -> com.android.tools.r8.internal.b2:
     java.util.ListIterator listIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> a
@@ -27849,7 +28098,7 @@
     1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forBinop():0:89 -> a
     1:90:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):127 -> a
     91:98:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):51:58 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1654:1654 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.canHaveMul2AddrBug():1672:1672 -> a
     99:99:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
     100:100:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> a
     100:100:boolean isTwoAddr(com.android.tools.r8.ir.regalloc.RegisterAllocator):58 -> a
@@ -27927,7 +28176,7 @@
     java.lang.Object target -> b
     com.android.tools.r8.graph.DexType guard -> a
     1:3:void <init>(com.android.tools.r8.graph.DexType,java.lang.Object):24:26 -> <init>
-com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.d5:
+com.android.tools.r8.ir.code.CheckCast -> com.android.tools.r8.internal.e5:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():28:28 -> <clinit>
@@ -27954,7 +28203,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):85:85 -> b
     3:11:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106:114 -> b
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     12:12:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):115 -> b
     13:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):117:129 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
@@ -27963,7 +28212,7 @@
     2:2:com.android.tools.r8.ir.code.Value object():56:56 -> f
     com.android.tools.r8.ir.code.CheckCast asCheckCast() -> s
     1:1:java.lang.String toString():154:154 -> toString
-com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.w6:
+com.android.tools.r8.ir.code.Cmp -> com.android.tools.r8.internal.B6:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.ir.code.Cmp$Bias bias -> j
     1:1:void <clinit>():26:26 -> <clinit>
@@ -28011,7 +28260,7 @@
     18:18:java.lang.String toString():117:117 -> toString
     19:20:java.lang.String toString():113:114 -> toString
     21:43:java.lang.String toString():109:131 -> toString
-com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.w6$a:
+com.android.tools.r8.ir.code.Cmp$Bias -> com.android.tools.r8.internal.B6$a:
     com.android.tools.r8.ir.code.Cmp$Bias LT -> c
     com.android.tools.r8.ir.code.Cmp$Bias NONE -> a
     com.android.tools.r8.ir.code.Cmp$Bias GT -> b
@@ -28020,7 +28269,7 @@
     2:2:void <clinit>():28:28 -> <clinit>
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:com.android.tools.r8.ir.code.Cmp$Bias[] values():28:28 -> a
-com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.W6:
+com.android.tools.r8.ir.code.ConstClass -> com.android.tools.r8.internal.b7:
     com.android.tools.r8.graph.DexType clazz -> k
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
@@ -28058,12 +28307,12 @@
     3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.code.ConstClass.getValue():61:61 -> b
     3:3:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103 -> b
     4:19:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):103:118 -> b
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     20:20:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):120 -> b
     21:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122:126 -> b
     1:1:java.lang.String toString():83:83 -> toString
     com.android.tools.r8.ir.code.ConstClass asConstClass() -> u
-com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.X6:
+com.android.tools.r8.ir.code.ConstInstruction -> com.android.tools.r8.internal.c7:
     int $r8$clinit -> h
     1:1:void <init>(com.android.tools.r8.ir.code.Value):33:33 -> <init>
     com.android.tools.r8.ir.code.ConstInstruction getOutConstantConstInstruction() -> I0
@@ -28073,7 +28322,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     boolean isConstInstruction() -> g1
     com.android.tools.r8.ir.code.ConstInstruction asConstInstruction() -> v
-com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.Z6:
+com.android.tools.r8.ir.code.ConstMethodHandle -> com.android.tools.r8.internal.e7:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethodHandle methodHandle -> j
     1:1:void <clinit>():21:21 -> <clinit>
@@ -28104,7 +28353,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     1:1:java.lang.String toString():93:93 -> toString
     com.android.tools.r8.ir.code.ConstMethodHandle asConstMethodHandle() -> w
-com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.a7:
+com.android.tools.r8.ir.code.ConstMethodType -> com.android.tools.r8.internal.f7:
     com.android.tools.r8.graph.DexProto methodType -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
@@ -28135,7 +28384,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):71:71 -> b
     1:1:java.lang.String toString():87:87 -> toString
     com.android.tools.r8.ir.code.ConstMethodType asConstMethodType() -> x
-com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.b7:
+com.android.tools.r8.ir.code.ConstNumber -> com.android.tools.r8.internal.g7:
     long value -> k
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
@@ -28200,7 +28449,7 @@
     1:1:boolean negativeIs8Bit():281:281 -> m2
     1:4:java.lang.String toString():257:260 -> toString
     com.android.tools.r8.ir.code.ConstNumber asConstNumber() -> y
-com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.d7:
+com.android.tools.r8.ir.code.ConstString -> com.android.tools.r8.internal.i7:
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> l
@@ -28223,7 +28472,7 @@
     6:6:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74 -> a
     7:8:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:75 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):140:140 -> a
-    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    10:10:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     10:10:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):140 -> a
     11:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):140:143 -> a
     15:15:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):141:141 -> a
@@ -28239,7 +28488,7 @@
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):80:80 -> b
     1:1:java.lang.String toString():96:96 -> toString
     com.android.tools.r8.ir.code.ConstString asConstString() -> z
-com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.h7:
+com.android.tools.r8.ir.code.ConstantValueUtils -> com.android.tools.r8.internal.m7:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:6:com.android.tools.r8.graph.DexType getDexTypeRepresentedByValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexDefinitionSupplier):20:25 -> a
@@ -28260,7 +28509,7 @@
     36:36:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
     36:36:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):55 -> a
     37:37:com.android.tools.r8.graph.DexType getDexTypeFromClassForName(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.E7:
+com.android.tools.r8.ir.code.DebugLocalRead -> com.android.tools.r8.internal.J7:
     1:1:void <init>():20:20 -> <init>
     boolean hasInvariantOutType() -> N0
     1:1:int maxInValueRegister():60:60 -> U1
@@ -28276,11 +28525,11 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalRead():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.F7:
+com.android.tools.r8.ir.code.DebugLocalUninitialized -> com.android.tools.r8.internal.K7:
     1:1:void <init>(com.android.tools.r8.ir.code.Value):21:21 -> <init>
     boolean isAllowedAfterThrowingInstruction() -> V0
     1:1:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):26:26 -> a
-com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.G7:
+com.android.tools.r8.ir.code.DebugLocalWrite -> com.android.tools.r8.internal.L7:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():27:27 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):30:31 -> <init>
@@ -28293,7 +28542,7 @@
     5:6:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):82:83 -> a
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
-com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.H7:
+com.android.tools.r8.ir.code.DebugLocalsChange -> com.android.tools.r8.internal.M7:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap starting -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap ending -> i
     boolean $assertionsDisabled -> h
@@ -28325,7 +28574,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getStarting():48:48 -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:java.lang.String toString():93:98 -> toString
-com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.I7:
+com.android.tools.r8.ir.code.DebugPosition -> com.android.tools.r8.internal.N7:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
@@ -28345,7 +28594,7 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):51 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.J7:
+com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration -> com.android.tools.r8.internal.O7:
     com.android.tools.r8.ir.code.DefaultAliasedValueConfiguration INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():7:9 -> <clinit>
@@ -28357,7 +28606,7 @@
     4:5:com.android.tools.r8.ir.code.Value getAliasForOutValue(com.android.tools.r8.ir.code.Instruction):25:26 -> a
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     1:1:boolean isIntroducingAnAlias(com.android.tools.r8.ir.code.Instruction):20 -> b
-com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.P7:
+com.android.tools.r8.ir.code.DefaultInstructionVisitor -> com.android.tools.r8.internal.U7:
     1:1:void <init>():7:7 -> <init>
     java.lang.Object handleFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction) -> a
     java.lang.Object handleInvoke(com.android.tools.r8.ir.code.Invoke) -> a
@@ -28373,7 +28622,7 @@
     2:2:java.lang.Object visit(com.android.tools.r8.ir.code.InstancePut):179:179 -> a
     3:3:java.lang.Object visit(com.android.tools.r8.ir.code.StaticGet):314:314 -> a
     4:4:java.lang.Object visit(com.android.tools.r8.ir.code.StaticPut):319:319 -> a
-com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.I8:
+com.android.tools.r8.ir.code.DexItemBasedConstString -> com.android.tools.r8.internal.N8:
     com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo nameComputationInfo -> l
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
@@ -28408,7 +28657,7 @@
     2:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):97:98 -> b
     1:1:com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo getNameComputationInfo():68:68 -> b2
     1:1:java.lang.String toString():114:114 -> toString
-com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.R8:
+com.android.tools.r8.ir.code.Div -> com.android.tools.r8.internal.a9:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     com.android.tools.r8.ir.code.Div asDiv() -> D
     1:1:boolean instructionTypeCanThrow():134:134 -> T0
@@ -28437,7 +28686,7 @@
     2:2:com.android.tools.r8.code.Instruction CreateIntLit8(int,int,int):94:94 -> e
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> f2
-com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.T8:
+com.android.tools.r8.ir.code.DominatorTree -> com.android.tools.r8.internal.c9:
     com.android.tools.r8.ir.code.BasicBlock[] doms -> c
     com.android.tools.r8.ir.code.BasicBlock[] sorted -> b
     boolean obsolete -> f
@@ -28469,7 +28718,7 @@
     5:5:void onSuccessorsMayChange(com.android.tools.r8.ir.code.BasicBlock):328:328 -> c
     1:2:void numberBlocks():240:241 -> d
     1:9:java.lang.String toString():308:316 -> toString
-com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.S8:
+com.android.tools.r8.ir.code.DominatorTree$1 -> com.android.tools.r8.internal.b9:
     com.android.tools.r8.ir.code.DominatorTree this$0 -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.BasicBlock val$dominated -> c
@@ -28479,17 +28728,17 @@
     1:1:boolean hasNext():201:201 -> hasNext
     1:9:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.DominatorTree$1.next():206:214 -> next
     1:9:java.lang.Object next():196 -> next
-com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.internal.T8$a:
+com.android.tools.r8.ir.code.DominatorTree$Assumption -> com.android.tools.r8.internal.c9$a:
     com.android.tools.r8.ir.code.DominatorTree$Assumption MAY_HAVE_UNREACHABLE_BLOCKS -> b
     com.android.tools.r8.ir.code.DominatorTree$Assumption NO_UNREACHABLE_BLOCKS -> a
     1:2:void <clinit>():19:20 -> <clinit>
     1:1:void <init>(java.lang.String,int):18:18 -> <init>
-com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.U8:
+com.android.tools.r8.ir.code.DominatorTree$Inclusive -> com.android.tools.r8.internal.d9:
     com.android.tools.r8.ir.code.DominatorTree$Inclusive YES -> a
     com.android.tools.r8.ir.code.DominatorTree$Inclusive NO -> b
     1:2:void <clinit>():24:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.a9:
+com.android.tools.r8.ir.code.Dup -> com.android.tools.r8.internal.j9:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):21:21 -> <init>
@@ -28516,7 +28765,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue src():63:63 -> c2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):41:46 -> e
-com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.Z8:
+com.android.tools.r8.ir.code.Dup2 -> com.android.tools.r8.internal.i9:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):28:28 -> <init>
@@ -28535,7 +28784,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):55:60 -> e
-com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.wa:
+com.android.tools.r8.ir.code.FieldInstruction -> com.android.tools.r8.internal.Fa:
     com.android.tools.r8.graph.DexField field -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():27:27 -> <clinit>
@@ -28545,7 +28794,7 @@
     boolean hasInvariantOutType() -> N0
     1:1:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):115:115 -> a
     2:24:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):164:186 -> a
-    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     25:25:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):186 -> a
     26:37:boolean isStoringObjectWithFinalizer(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedField):190:201 -> a
     38:39:com.android.tools.r8.ir.analysis.value.AbstractValue getAbstractValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):207:208 -> a
@@ -28558,13 +28807,13 @@
     3:228:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):0:225 -> b
     3:228:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):69 -> b
     229:233:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):69:73 -> b
-    234:234:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> b
+    234:234:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> b
     234:234:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):75 -> b
     235:241:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):75:81 -> b
-    242:243:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):43:44 -> b
+    242:243:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42:43 -> b
     242:243:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult.isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):102 -> b
     242:243:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):81 -> b
-    244:244:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):42:42 -> b
+    244:244:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):41:41 -> b
     244:244:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.FieldResolutionResult$SuccessfulFieldResolutionResult.isAccessibleFrom(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppInfoWithClassHierarchy):102 -> b
     244:244:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):81 -> b
     245:245:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):82:82 -> b
@@ -28578,11 +28827,11 @@
     7:7:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.code.FieldInstruction.getField():48:48 -> f
     7:7:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):137 -> f
     8:11:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):139:142 -> f
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> f
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> f
     12:12:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142 -> f
     13:23:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):144:154 -> f
     boolean isFieldInstruction() -> o1
-com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.xa:
+com.android.tools.r8.ir.code.FieldMemberType -> com.android.tools.r8.internal.Ga:
     com.android.tools.r8.ir.code.FieldMemberType DOUBLE -> i
     com.android.tools.r8.ir.code.FieldMemberType[] $VALUES -> j
     com.android.tools.r8.ir.code.FieldMemberType LONG -> h
@@ -28611,7 +28860,7 @@
     43:43:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType com.android.tools.r8.ir.code.FieldMemberType.fromTypeDescriptorChar(char):30:30 -> a
     44:44:com.android.tools.r8.ir.code.FieldMemberType fromDexType(com.android.tools.r8.graph.DexType):51 -> a
-com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.Sa:
+com.android.tools.r8.ir.code.FixedRegisterValue -> com.android.tools.r8.internal.bb:
     boolean $assertionsDisabled -> q
     int register -> r
     1:1:void <clinit>():12:12 -> <clinit>
@@ -28635,7 +28884,7 @@
     com.android.tools.r8.ir.code.FixedRegisterValue asFixedRegisterValue() -> e
     1:1:int getRegister():50:50 -> h0
     1:1:java.lang.String toString():75:75 -> toString
-com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Kb:
+com.android.tools.r8.ir.code.Goto -> com.android.tools.r8.internal.Tb:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():17:17 -> <init>
@@ -28653,7 +28902,7 @@
     1:4:com.android.tools.r8.ir.code.BasicBlock getTarget():36:39 -> b2
     boolean isGoto() -> q1
     1:4:java.lang.String toString():71:74 -> toString
-com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.mc:
+com.android.tools.r8.ir.code.IRCode -> com.android.tools.r8.internal.vc:
     boolean allThrowingInstructionsHavePositions -> i
     int nextInstructionNumber -> h
     int usedMarkingColors -> f
@@ -28669,18 +28918,18 @@
     1:1:void <clinit>():58:58 -> <clinit>
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):134:134 -> <init>
     2:35:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.ProgramMethod,java.util.LinkedList,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.IRMetadata,com.android.tools.r8.origin.Origin):113:146 -> <init>
-    1:13:java.util.Set removeUnreachableBlocks():1319:1331 -> A
-    1:1:int reserveMarkingColor():1221:1221 -> B
-    2:2:boolean com.android.tools.r8.ir.code.IRCode.anyMarkingColorAvailable():1235:1235 -> B
-    2:2:int reserveMarkingColor():1221 -> B
-    3:10:int reserveMarkingColor():1221:1228 -> B
+    1:13:java.util.Set removeUnreachableBlocks():1316:1328 -> A
+    1:1:int reserveMarkingColor():1218:1218 -> B
+    2:2:boolean com.android.tools.r8.ir.code.IRCode.anyMarkingColorAvailable():1232:1232 -> B
+    2:2:int reserveMarkingColor():1218 -> B
+    3:10:int reserveMarkingColor():1218:1225 -> B
     11:12:boolean com.android.tools.r8.ir.code.IRCode.verifyNoBlocksMarked(int):498:499 -> B
-    11:12:int reserveMarkingColor():1229 -> B
+    11:12:int reserveMarkingColor():1226 -> B
     1:11:void splitCriticalEdges():367:377 -> C
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> C
     12:12:void splitCriticalEdges():377 -> C
     13:17:void splitCriticalEdges():377:381 -> C
-    18:18:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> C
+    18:18:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> C
     18:18:void splitCriticalEdges():389 -> C
     19:19:void splitCriticalEdges():389:389 -> C
     20:29:void splitCriticalEdges():388:397 -> C
@@ -28701,11 +28950,11 @@
     36:39:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.ir.code.IRCode.reorderExceptionalBlocksLastForTesting(com.android.tools.r8.com.google.common.collect.ImmutableList):560:563 -> E
     36:39:com.android.tools.r8.com.google.common.collect.ImmutableList topologicallySortedBlocks():518 -> E
     1:14:void traceBlocks():428:441 -> F
-    15:15:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> F
+    15:15:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> F
     15:15:void traceBlocks():446 -> F
     16:16:void traceBlocks():446:446 -> F
     17:29:void traceBlocks():445:457 -> F
-    30:30:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1264:1264 -> F
+    30:30:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1261:1261 -> F
     30:30:void traceBlocks():457 -> F
     31:31:void traceBlocks():457:457 -> F
     1:12:boolean verifyNoImpreciseOrBottomTypes():938:949 -> G
@@ -28734,17 +28983,17 @@
     40:53:java.util.List collectArguments():1068 -> a
     54:54:java.util.List com.android.tools.r8.ir.code.IRCode.collectArguments(boolean):1083:1083 -> a
     54:54:java.util.List collectArguments():1068 -> a
-    55:55:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1101:1101 -> a
-    56:56:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1113:1113 -> a
-    57:57:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1129:1129 -> a
-    58:58:void setAllThrowingInstructionsHavePositions(boolean):1176:1176 -> a
-    59:65:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1206:1212 -> a
-    66:66:boolean isMarkingColorInUse(int):1251:1251 -> a
-    67:67:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1361:1361 -> a
-    68:68:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1251:1251 -> a
-    68:68:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1361 -> a
-    69:80:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1361:1372 -> a
-    81:102:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1383:1404 -> a
+    55:55:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1102:1102 -> a
+    56:56:com.android.tools.r8.ir.code.ConstNumber createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):1110:1110 -> a
+    57:57:com.android.tools.r8.ir.code.ConstNumber createIntConstant(int,com.android.tools.r8.graph.DebugLocalInfo):1126:1126 -> a
+    58:58:void setAllThrowingInstructionsHavePositions(boolean):1173:1173 -> a
+    59:65:boolean removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder,java.util.Set):1203:1209 -> a
+    66:66:boolean isMarkingColorInUse(int):1248:1248 -> a
+    67:67:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1358:1358 -> a
+    68:68:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1248:1248 -> a
+    68:68:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1358 -> a
+    69:80:void markTransitivePredecessors(com.android.tools.r8.ir.code.BasicBlock,int):1358:1369 -> a
+    81:102:com.android.tools.r8.ir.code.Position findFirstNonNonePosition(com.android.tools.r8.ir.code.Position):1380:1401 -> a
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
     1:1:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$11(com.android.tools.r8.ir.code.Instruction):969 -> b
     2:2:void removeBlocks(java.util.Collection):505:505 -> b
@@ -28761,23 +29010,23 @@
     14:16:boolean lambda$verifyNoNullabilityBottomTypes$9(com.android.tools.r8.ir.code.Value):955:955 -> b
     17:17:java.lang.Iterable instructions(java.util.function.Predicate):1016:1016 -> b
     18:18:com.android.tools.r8.ir.code.BasicBlockIterator listIterator(int):1042:1042 -> b
-    19:20:boolean computeAllThrowingInstructionsHavePositions():1180:1181 -> b
+    19:20:boolean computeAllThrowingInstructionsHavePositions():1177:1178 -> b
     21:21:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
-    21:21:boolean computeAllThrowingInstructionsHavePositions():1182 -> b
+    21:21:boolean computeAllThrowingInstructionsHavePositions():1179 -> b
     22:22:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> b
-    22:22:boolean computeAllThrowingInstructionsHavePositions():1183 -> b
-    23:24:boolean computeAllThrowingInstructionsHavePositions():1184:1185 -> b
-    25:25:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1336:1336 -> b
-    26:26:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1340:1340 -> b
-    26:26:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1336 -> b
-    27:27:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1251:1251 -> b
-    27:27:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1340 -> b
-    27:27:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1336 -> b
-    28:29:boolean com.android.tools.r8.ir.code.IRCode.anyBlocksMarkedWithColor(int):1255:1256 -> b
-    28:29:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1340 -> b
-    28:29:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1336 -> b
-    30:39:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1340:1349 -> b
-    30:39:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1336 -> b
+    22:22:boolean computeAllThrowingInstructionsHavePositions():1180 -> b
+    23:24:boolean computeAllThrowingInstructionsHavePositions():1181:1182 -> b
+    25:25:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1333:1333 -> b
+    26:26:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1337:1337 -> b
+    26:26:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1333 -> b
+    27:27:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1248:1248 -> b
+    27:27:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1337 -> b
+    27:27:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1333 -> b
+    28:29:boolean com.android.tools.r8.ir.code.IRCode.anyBlocksMarkedWithColor(int):1252:1253 -> b
+    28:29:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1337 -> b
+    28:29:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1333 -> b
+    30:39:void com.android.tools.r8.ir.code.IRCode.markTransitiveSuccessors(java.util.Deque,int):1337:1346 -> b
+    30:39:void markTransitiveSuccessors(com.android.tools.r8.ir.code.BasicBlock,int):1333 -> b
     1:53:java.util.Map computeLiveAtEntrySets():170:222 -> c
     54:74:java.util.Map computeLiveAtEntrySets():221:241 -> c
     75:75:java.util.List com.android.tools.r8.ir.code.Instruction.inValues():102:102 -> c
@@ -28790,13 +29039,13 @@
     121:127:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Value):965:965 -> c
     133:133:boolean lambda$verifyNoValueWithOnlyAssumeInstructionAsUsers$12(com.android.tools.r8.ir.code.Value):971:971 -> c
     134:134:java.util.Iterator lambda$blocks$14(java.util.function.Predicate):1004:1004 -> c
-    135:135:void returnMarkingColor(int):1245:1245 -> c
-    136:136:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1251:1251 -> c
-    136:136:void returnMarkingColor(int):1245 -> c
-    137:137:void returnMarkingColor(int):1245:1245 -> c
+    135:135:void returnMarkingColor(int):1242:1242 -> c
+    136:136:boolean com.android.tools.r8.ir.code.IRCode.isMarkingColorInUse(int):1248:1248 -> c
+    136:136:void returnMarkingColor(int):1242 -> c
+    137:137:void returnMarkingColor(int):1242:1242 -> c
     138:139:void com.android.tools.r8.ir.code.IRCode.clearMarks(int):482:483 -> c
-    138:139:void returnMarkingColor(int):1246 -> c
-    140:140:void returnMarkingColor(int):1247:1247 -> c
+    138:139:void returnMarkingColor(int):1243 -> c
+    140:140:void returnMarkingColor(int):1244:1244 -> c
     1:1:java.util.Collection lambda$consistentPredecessorSuccessors$6(java.util.function.Function,com.android.tools.r8.ir.code.BasicBlock):777:777 -> d
     2:2:java.util.Iterator lambda$instructions$15(java.util.function.Predicate):1016:1016 -> d
     3:9:java.util.List computeNormalExitBlocks():1028:1034 -> d
@@ -28805,19 +29054,19 @@
     1:33:boolean consistentPredecessorSuccessors():746:778 -> f
     34:34:java.util.function.Predicate wrapSSAVerifierWithStackValueHandling(java.util.function.Predicate):978:978 -> f
     1:1:com.android.tools.r8.graph.ProgramMethod context():154:154 -> g
-    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1164:1164 -> h
-    2:2:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1109:1109 -> h
-    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1164 -> h
-    1:1:boolean doAllThrowingInstructionsHavePositions():1172:1172 -> i
+    1:1:com.android.tools.r8.ir.code.ConstNumber createConstNull():1161:1161 -> h
+    2:2:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createNumberConstant(long,com.android.tools.r8.ir.analysis.type.TypeElement):1106:1106 -> h
+    2:2:com.android.tools.r8.ir.code.ConstNumber createConstNull():1161 -> h
+    1:1:boolean doAllThrowingInstructionsHavePositions():1169:1169 -> i
     1:1:com.android.tools.r8.ir.code.BasicBlock entryBlock():163:163 -> j
-    1:1:int getCurrentBlockNumber():1155:1155 -> k
+    1:1:int getCurrentBlockNumber():1152:1152 -> k
     1:1:int getNextInstructionNumber():1064:1064 -> l
     1:7:com.android.tools.r8.ir.code.Value getThis():1090:1096 -> m
-    1:9:java.util.Set getUnreachableBlocks():1306:1314 -> n
+    1:9:java.util.Set getUnreachableBlocks():1303:1311 -> n
     1:1:com.android.tools.r8.ir.code.InstructionIterator instructionIterator():1020:1020 -> o
     1:1:java.lang.Iterable instructions():1008:1008 -> p
     1:1:boolean isConsistentGraph():607:607 -> q
-    2:2:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1264:1264 -> q
+    2:2:boolean com.android.tools.r8.ir.code.IRCode.noColorsInUse():1261:1261 -> q
     2:2:boolean isConsistentGraph():607 -> q
     3:5:boolean isConsistentGraph():607:609 -> q
     6:7:boolean com.android.tools.r8.ir.code.IRCode.consistentCatchHandlers():785:786 -> q
@@ -29002,17 +29251,17 @@
     1:3:com.android.tools.r8.com.google.common.collect.ImmutableList numberInstructions():1046:1048 -> w
     1:7:int numberRemainingInstructions():1054:1060 -> x
     1:23:void prepareBlocksForCatchHandlers():332:354 -> y
-    24:24:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> y
+    24:24:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> y
     24:24:void prepareBlocksForCatchHandlers():355 -> y
     25:26:void prepareBlocksForCatchHandlers():355:356 -> y
     27:28:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> y
     27:28:void prepareBlocksForCatchHandlers():356 -> y
     29:35:void prepareBlocksForCatchHandlers():357:363 -> y
-    1:1:boolean removeAllDeadAndTrivialPhis():1193:1193 -> z
-com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.mc$a:
+    1:1:boolean removeAllDeadAndTrivialPhis():1190:1190 -> z
+com.android.tools.r8.ir.code.IRCode$BlockMarker -> com.android.tools.r8.internal.vc$a:
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:2:void <init>(com.android.tools.r8.ir.code.BasicBlock):99:100 -> <init>
-com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.mc$b:
+com.android.tools.r8.ir.code.IRCode$LiveAtEntrySets -> com.android.tools.r8.internal.vc$b:
     java.util.Deque liveStackValues -> d
     java.util.Set liveLocalValues -> c
     java.util.Set liveValues -> b
@@ -29021,7 +29270,7 @@
     1:5:void <init>(java.util.Set,java.util.Set,java.util.Deque):72:76 -> <init>
     1:2:boolean equals(java.lang.Object):86:87 -> equals
     1:1:int hashCode():81:81 -> hashCode
-com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.nc:
+com.android.tools.r8.ir.code.IRCodeInstructionIterator -> com.android.tools.r8.internal.wc:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
@@ -29036,45 +29285,46 @@
     10:10:java.lang.Object next():10 -> next
     1:10:com.android.tools.r8.ir.code.Instruction previous():48:57 -> previous
     11:11:com.android.tools.r8.ir.code.Instruction previous():52:52 -> previous
-com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.oc:
+com.android.tools.r8.ir.code.IRCodeInstructionListIterator -> com.android.tools.r8.internal.xc:
     java.util.ListIterator blockIterator -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.InstructionListIterator instructionIterator -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():19:19 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.ir.code.IRCode):26:29 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):35:35 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):40:40 -> a
-    3:3:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):45:45 -> a
-    4:4:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):51:51 -> a
-    5:5:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):67:67 -> a
-    6:6:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):73:73 -> a
-    7:7:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):78:78 -> a
-    8:8:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):89:89 -> a
-    9:9:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):156:156 -> a
-    10:10:void setInsertionPosition(com.android.tools.r8.ir.code.Position):171:171 -> a
-    1:1:void add(java.lang.Object):19:19 -> add
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):141:141 -> add
-    2:2:void add(java.lang.Object):19 -> add
-    1:1:void unsetInsertionPosition():176:176 -> g
-    1:1:void removeOrReplaceByDebugLocalRead():161:161 -> h
-    1:1:boolean hasNext():94:94 -> hasNext
-    1:1:boolean hasPrevious():112:112 -> hasPrevious
-    1:1:void removeInstructionIgnoreOutValue():57:57 -> k
-    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():99:107 -> next
-    1:9:java.lang.Object next():19 -> next
-    10:10:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():103:103 -> next
-    10:10:java.lang.Object next():19 -> next
-    1:1:int nextIndex():131:131 -> nextIndex
-    1:1:java.lang.Object previous():19:19 -> previous
-    2:11:com.android.tools.r8.ir.code.Instruction previous():117:126 -> previous
-    12:12:com.android.tools.r8.ir.code.Instruction previous():121:121 -> previous
-    1:1:int previousIndex():136:136 -> previousIndex
-    1:1:void remove():146:146 -> remove
-    1:1:void set(java.lang.Object):19:19 -> set
-    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):151:151 -> set
-    2:2:void set(java.lang.Object):19 -> set
-com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.pc:
+    1:1:void <clinit>():20:20 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.ir.code.IRCode):27:30 -> <init>
+    1:1:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):36:36 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):41:41 -> a
+    3:3:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):47:47 -> a
+    4:4:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):52:52 -> a
+    5:5:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):58:58 -> a
+    6:6:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):74:74 -> a
+    7:7:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):80:80 -> a
+    8:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):85:85 -> a
+    9:9:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):96:96 -> a
+    10:10:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):163:163 -> a
+    11:11:void setInsertionPosition(com.android.tools.r8.ir.code.Position):178:178 -> a
+    1:1:void add(java.lang.Object):20:20 -> add
+    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):148:148 -> add
+    2:2:void add(java.lang.Object):20 -> add
+    1:1:void unsetInsertionPosition():183:183 -> g
+    1:1:void removeOrReplaceByDebugLocalRead():168:168 -> h
+    1:1:boolean hasNext():101:101 -> hasNext
+    1:1:boolean hasPrevious():119:119 -> hasPrevious
+    1:1:void removeInstructionIgnoreOutValue():64:64 -> k
+    1:9:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():106:114 -> next
+    1:9:java.lang.Object next():20 -> next
+    10:10:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.IRCodeInstructionListIterator.next():110:110 -> next
+    10:10:java.lang.Object next():20 -> next
+    1:1:int nextIndex():138:138 -> nextIndex
+    1:1:java.lang.Object previous():20:20 -> previous
+    2:11:com.android.tools.r8.ir.code.Instruction previous():124:133 -> previous
+    12:12:com.android.tools.r8.ir.code.Instruction previous():128:128 -> previous
+    1:1:int previousIndex():143:143 -> previousIndex
+    1:1:void remove():153:153 -> remove
+    1:1:void set(java.lang.Object):20:20 -> set
+    2:2:void com.android.tools.r8.ir.code.IRCodeInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):158:158 -> set
+    2:2:void set(java.lang.Object):20 -> set
+com.android.tools.r8.ir.code.IRCodeUtils -> com.android.tools.r8.internal.yc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
     1:7:com.android.tools.r8.ir.code.InvokeDirect getUniqueConstructorInvoke(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):24:30 -> a
@@ -29092,7 +29342,7 @@
     75:78:void internalRemoveInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,java.util.Deque):148:151 -> a
     1:1:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):114:114 -> b
     2:2:void removeInstructionAndTransitiveInputsIfNotUsed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction):113:113 -> b
-com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.qc:
+com.android.tools.r8.ir.code.IRMetadata -> com.android.tools.r8.internal.zc:
     long first -> b
     long second -> c
     boolean $assertionsDisabled -> a
@@ -29212,7 +29462,7 @@
     1:1:boolean mayHaveInvokeSuper():202:202 -> x
     1:1:boolean mayHaveInvokeVirtual():206:206 -> y
     1:1:boolean mayHaveMonitorInstruction():210:210 -> z
-com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.wc:
+com.android.tools.r8.ir.code.If -> com.android.tools.r8.internal.Ic:
     boolean $assertionsDisabled -> i
     int $r8$clinit -> j
     com.android.tools.r8.ir.code.If$Type type -> k
@@ -29258,7 +29508,7 @@
     1:3:com.android.tools.r8.ir.code.BasicBlock targetFromNonNullObject():222:224 -> h2
     boolean isIf() -> r1
     1:8:java.lang.String toString():169:176 -> toString
-com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.wc$a:
+com.android.tools.r8.ir.code.If$Type -> com.android.tools.r8.internal.Ic$a:
     com.android.tools.r8.ir.code.If$Type GT -> c
     com.android.tools.r8.ir.code.If$Type LE -> d
     com.android.tools.r8.ir.code.If$Type EQ -> a
@@ -29276,10 +29526,10 @@
     19:27:com.android.tools.r8.ir.code.If$Type inverted():49:57 -> a
     28:28:com.android.tools.r8.ir.code.If$Type inverted():47:47 -> a
     1:1:com.android.tools.r8.ir.code.If$Type[] values():22:22 -> b
-com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.qd:
+com.android.tools.r8.ir.code.ImpreciseMemberTypeInstruction -> com.android.tools.r8.internal.Cd:
     void constrainType(com.android.tools.r8.ir.conversion.TypeConstraintResolver) -> a
     com.android.tools.r8.ir.code.MemberType getMemberType() -> e
-com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.rd:
+com.android.tools.r8.ir.code.Inc -> com.android.tools.r8.internal.Dd:
     int increment -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():20:20 -> <clinit>
@@ -29295,7 +29545,7 @@
     1:2:void addInValue(com.android.tools.r8.ir.code.Value):43:44 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):54:54 -> b
     1:1:java.lang.String toString():102:102 -> toString
-com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.xd:
+com.android.tools.r8.ir.code.InitClass -> com.android.tools.r8.internal.Ld:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():27:27 -> <clinit>
@@ -29306,31 +29556,42 @@
     int maxInValueRegister() -> U1
     int maxOutValueRegister() -> V1
     int opcode() -> W1
-    1:1:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):55:55 -> a
-    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):65:65 -> a
-    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):70:71 -> a
-    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):76:76 -> a
-    6:6:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):86:86 -> a
-    7:7:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):113:113 -> a
-    8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):123:123 -> a
-    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):161:161 -> a
-    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):166:166 -> a
-    1:1:com.android.tools.r8.graph.DexType getClassValue():40:40 -> a2
+    1:1:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):59:59 -> a
+    2:2:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):69:69 -> a
+    3:4:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):74:75 -> a
+    5:5:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):80:80 -> a
+    6:6:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):90:90 -> a
+    7:7:boolean lambda$instructionInstanceCanThrow$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):117:117 -> a
+    8:8:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):127:127 -> a
+    9:9:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):165:165 -> a
+    10:10:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):170:170 -> a
+    1:1:com.android.tools.r8.ir.code.InitClass$Builder builder():40:40 -> a2
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> b
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92 -> b
-    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):92:92 -> b
-    3:5:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98:100 -> b
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
-    6:6:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):100 -> b
-    7:15:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):106:114 -> b
-    16:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):110:110 -> b
-    17:17:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):134:134 -> b
-    1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):128:135 -> d
-    9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):131:139 -> d
-    1:1:java.lang.String toString():176:176 -> toString
-com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.Ud:
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96 -> b
+    2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):96:96 -> b
+    3:5:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):102:104 -> b
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
+    6:6:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104 -> b
+    7:15:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):110:118 -> b
+    16:16:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):114:114 -> b
+    17:17:boolean lambda$instructionMayTriggerMethodInvocation$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):138:138 -> b
+    1:1:com.android.tools.r8.graph.DexType getClassValue():44:44 -> b2
+    1:8:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):132:139 -> d
+    9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):135:143 -> d
+    1:1:java.lang.String toString():180:180 -> toString
+com.android.tools.r8.ir.code.InitClass$1 -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.ir.code.InitClass$Builder -> com.android.tools.r8.internal.Kd:
+    com.android.tools.r8.graph.DexType type -> c
+    1:1:void <init>(com.android.tools.r8.ir.code.InitClass$1):183:183 -> <init>
+    2:2:void <init>():187:187 -> <init>
+    com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
+    1:1:com.android.tools.r8.ir.code.InitClass$Builder setType(com.android.tools.r8.graph.DexType):190:190 -> a
+    1:1:com.android.tools.r8.ir.code.InitClass build():196:196 -> b
+    2:3:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1557:1558 -> b
+    2:3:com.android.tools.r8.ir.code.InitClass build():196 -> b
+com.android.tools.r8.ir.code.InstanceFieldInstruction -> com.android.tools.r8.internal.ie:
     com.android.tools.r8.ir.code.Value object() -> f
-com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.Xd:
+com.android.tools.r8.ir.code.InstanceGet -> com.android.tools.r8.internal.le:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -29370,7 +29631,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:2:com.android.tools.r8.ir.code.Value object():62:63 -> f
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.Zd:
+com.android.tools.r8.ir.code.InstanceOf -> com.android.tools.r8.internal.ne:
     com.android.tools.r8.graph.DexType type -> h
     1:2:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):25:26 -> <init>
     com.android.tools.r8.ir.code.InstanceOf asInstanceOf() -> L
@@ -29394,7 +29655,7 @@
     1:1:com.android.tools.r8.ir.code.Value value():48:48 -> b2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:2:java.lang.String toString():127:128 -> toString
-com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.ae:
+com.android.tools.r8.ir.code.InstancePut -> com.android.tools.r8.internal.oe:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):37:37 -> <init>
@@ -29434,7 +29695,7 @@
     boolean isInstanceFieldInstruction() -> s1
     boolean isInstancePut() -> t1
     1:1:java.lang.String toString():212:212 -> toString
-com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.he:
+com.android.tools.r8.ir.code.Instruction -> com.android.tools.r8.internal.re:
     com.android.tools.r8.ir.code.Position position -> g
     java.util.List inValues -> c
     java.util.Set debugValues -> f
@@ -29706,7 +29967,18 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> z1
     1:1:boolean isInvokeMethodWithDynamicDispatch():1201 -> z1
     2:2:boolean isInvokeMethodWithDynamicDispatch():1201:1201 -> z1
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.he$a:
+com.android.tools.r8.ir.code.Instruction$BuilderBase -> com.android.tools.r8.internal.re$a:
+    com.android.tools.r8.ir.code.Position position -> b
+    com.android.tools.r8.ir.code.Value outValue -> a
+    1:1:void <init>():1547:1547 -> <init>
+    com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
+    1:1:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1569:1569 -> a
+    2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setOutValue(com.android.tools.r8.ir.code.Value):1564:1565 -> a
+    2:3:com.android.tools.r8.ir.code.Instruction$BuilderBase setFreshOutValue(com.android.tools.r8.ir.code.ValueFactory,com.android.tools.r8.ir.analysis.type.TypeElement):1569 -> a
+    4:4:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1578:1578 -> a
+    5:6:com.android.tools.r8.ir.code.Instruction$BuilderBase com.android.tools.r8.ir.code.Instruction$BuilderBase.setPosition(com.android.tools.r8.ir.code.Position):1573:1574 -> a
+    5:6:com.android.tools.r8.ir.code.Instruction$BuilderBase setPosition(com.android.tools.r8.ir.code.Instruction):1578 -> a
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption -> com.android.tools.r8.internal.re$b:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption NONE -> a
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption CLASS_ALREADY_INITIALIZED -> b
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption INVOKED_METHOD_DOES_NOT_HAVE_SIDE_EFFECTS -> c
@@ -29717,52 +29989,54 @@
     1:1:com.android.tools.r8.ir.code.Instruction$SideEffectAssumption join(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1524:1524 -> a
     boolean canAssumeInvokedMethodDoesNotHaveSideEffects() -> b
     boolean canAssumeReceiverIsNotNull() -> c
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.de:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$1 -> com.android.tools.r8.internal.se:
     1:1:void <init>():1485:1485 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.ee:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$2 -> com.android.tools.r8.internal.te:
     1:1:void <init>():1494:1494 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.fe:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$3 -> com.android.tools.r8.internal.ue:
     1:1:void <init>():1503:1503 -> <init>
-com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.ge:
+com.android.tools.r8.ir.code.Instruction$SideEffectAssumption$4 -> com.android.tools.r8.internal.ve:
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption val$other -> e
     com.android.tools.r8.ir.code.Instruction$SideEffectAssumption this$0 -> f
     1:1:void <init>(com.android.tools.r8.ir.code.Instruction$SideEffectAssumption,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):1524:1524 -> <init>
     1:2:boolean canAssumeClassIsAlreadyInitialized():1528:1529 -> a
     1:2:boolean canAssumeInvokedMethodDoesNotHaveSideEffects():1534:1535 -> b
     1:2:boolean canAssumeReceiverIsNotNull():1540:1541 -> c
-com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.je:
+com.android.tools.r8.ir.code.InstructionIterator -> com.android.tools.r8.internal.xe:
     1:3:com.android.tools.r8.ir.code.Instruction peekNext():30:32 -> d
     1:3:com.android.tools.r8.ir.code.Instruction peekPrevious():45:47 -> i
     1:1:void remove():15:15 -> remove
-com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.ke:
+com.android.tools.r8.ir.code.InstructionListIterator -> com.android.tools.r8.internal.ye:
     com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString) -> a
     void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set) -> a
+    void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo) -> a
     void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int) -> a
     void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set) -> a
     void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set) -> a
     void setInsertionPosition(com.android.tools.r8.ir.code.Position) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator) -> a
     com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean) -> a
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):74:74 -> a
-    3:3:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):78:78 -> a
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):132:132 -> a
-    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):136:136 -> a
-    6:8:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):211:213 -> a
+    1:3:void addBefore(com.android.tools.r8.ir.code.Instruction):24:26 -> a
+    4:4:com.android.tools.r8.ir.code.Value insertConstNullInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):81:81 -> a
+    5:5:com.android.tools.r8.ir.code.Value insertConstIntInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,int):85:85 -> a
+    6:6:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator):142:142 -> a
+    7:7:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode):146:146 -> a
+    8:10:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode):221:223 -> a
     1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):18:20 -> b
     1:3:java.lang.Object com.android.tools.r8.ir.code.PreviousUntilIterator.previousUntil(java.util.function.Predicate):0 -> b
-    4:4:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):163:163 -> b
+    4:4:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> b
+    5:5:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int):173:173 -> b
     void unsetInsertionPosition() -> g
     void removeOrReplaceByDebugLocalRead() -> h
-    1:1:void removeInstructionIgnoreOutValue():52:52 -> k
-com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.le:
+    1:1:void removeInstructionIgnoreOutValue():59:59 -> k
+com.android.tools.r8.ir.code.InstructionOrPhi -> com.android.tools.r8.internal.ze:
     boolean isPhi() -> a
     com.android.tools.r8.ir.code.Instruction asInstruction() -> c
     com.android.tools.r8.ir.code.Phi asPhi() -> g
     com.android.tools.r8.ir.code.BasicBlock getBlock() -> h
-com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.Vf:
+com.android.tools.r8.ir.code.IntSwitch -> com.android.tools.r8.internal.ig:
     int $r8$clinit -> m
     boolean $assertionsDisabled -> l
     int[] keys -> n
@@ -29778,7 +30052,7 @@
     3:3:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50 -> a
     4:4:void forEachCase(com.android.tools.r8.utils.IntObjConsumer):50:50 -> a
     5:5:com.android.tools.r8.ir.code.Instruction materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56:56 -> a
-    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
+    6:6:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
     6:6:com.android.tools.r8.ir.code.Instruction materializeFirstKey(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):56 -> a
     7:7:long numberOfTargetsIfPacked(int[]):74:74 -> a
     8:8:boolean canBePacked(com.android.tools.r8.utils.InternalOutputMode,long):85:85 -> a
@@ -29832,16 +30106,16 @@
     5:5:java.lang.String toString():274 -> toString
     6:11:java.lang.String toString():274:279 -> toString
     boolean isIntSwitch() -> u1
-com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.ng:
+com.android.tools.r8.ir.code.Invoke -> com.android.tools.r8.internal.Ag:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():32:32 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,java.util.List):109:109 -> <init>
-    1:1:java.lang.String getInstructionName():325:325 -> F0
+    1:1:java.lang.String getInstructionName():329:329 -> F0
     com.android.tools.r8.ir.code.Invoke asInvoke() -> O
     boolean instructionTypeCanThrow() -> T0
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> U1
-    1:1:int maxInValueRegister():269 -> U1
-    2:4:int maxInValueRegister():269:271 -> U1
+    1:1:int maxInValueRegister():273 -> U1
+    2:4:int maxInValueRegister():273:275 -> U1
     int maxOutValueRegister() -> V1
     1:21:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):120:140 -> a
     22:24:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):136:138 -> a
@@ -29852,77 +30126,77 @@
     29:29:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):126:126 -> a
     30:30:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):124:124 -> a
     31:31:com.android.tools.r8.ir.code.Invoke create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List,boolean):122:122 -> a
-    32:32:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):168:168 -> a
+    32:32:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):172:172 -> a
     33:33:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> a
-    33:33:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):169 -> a
-    34:34:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):169:169 -> a
+    33:33:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):173 -> a
+    34:34:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):173:173 -> a
     35:35:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> a
-    35:35:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):175 -> a
-    36:36:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):175:175 -> a
-    37:37:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):181:181 -> a
+    35:35:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):179 -> a
+    36:36:int argumentRegisterValue(int,com.android.tools.r8.ir.conversion.DexBuilder):179:179 -> a
+    37:37:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):185:185 -> a
     38:38:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> a
-    38:38:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):183 -> a
-    39:48:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):183:192 -> a
+    38:38:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):187 -> a
+    39:48:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):187:196 -> a
     49:49:int com.android.tools.r8.ir.code.Value.requiredRegisters():259:259 -> a
-    49:49:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):193 -> a
-    50:52:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):194:196 -> a
+    49:49:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):197 -> a
+    50:52:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):198:200 -> a
     53:53:int com.android.tools.r8.ir.code.Value.requiredRegisters():259:259 -> a
-    53:53:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):196 -> a
-    54:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):196:196 -> a
+    53:53:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):200 -> a
+    54:54:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):200:200 -> a
     55:55:int com.android.tools.r8.ir.code.Value.requiredRegisters():259:259 -> a
-    55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):197 -> a
-    56:57:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):198:199 -> a
-    58:71:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):218:231 -> a
-    72:76:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):229:233 -> a
-    77:93:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):239:255 -> a
-    94:100:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):253:259 -> a
-    101:105:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):340:344 -> a
-    106:106:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):342:342 -> a
-    107:107:boolean outTypeKnownToBeBoolean(java.util.Set):349:349 -> a
+    55:55:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):201 -> a
+    56:57:int fillArgumentRegisters(com.android.tools.r8.ir.conversion.DexBuilder,int[]):202:203 -> a
+    58:71:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):222:235 -> a
+    72:76:void addInvokeAndMoveResult(com.android.tools.r8.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):233:237 -> a
+    77:93:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):243:259 -> a
+    94:100:boolean couldIntroduceAnAlias(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.Value):257:263 -> a
+    101:105:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):344:348 -> a
+    106:106:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):346:346 -> a
+    107:107:boolean outTypeKnownToBeBoolean(java.util.Set):353:353 -> a
     1:1:java.util.List arguments():152:152 -> a2
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b
-    1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):206 -> b
-    2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):206:207 -> b
+    1:1:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):210 -> b
+    2:3:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):210:211 -> b
     4:4:int com.android.tools.r8.ir.code.Value.requiredRegisters():259:259 -> b
-    4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):207 -> b
+    4:4:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):211 -> b
     5:5:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b
-    5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):208 -> b
-    6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):208:208 -> b
+    5:5:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):212 -> b
+    6:6:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):212:212 -> b
     7:7:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b
-    7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):209 -> b
-    8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):209:210 -> b
+    7:7:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):213 -> b
+    8:9:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):213:214 -> b
     10:10:int com.android.tools.r8.ir.code.Value.requiredRegisters():259:259 -> b
-    10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):211 -> b
+    10:10:boolean argumentsConsecutive(com.android.tools.r8.ir.conversion.DexBuilder):215 -> b
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b
     11:11:com.android.tools.r8.ir.code.Value getArgument(int):156 -> b
     12:12:com.android.tools.r8.ir.code.Value getArgument(int):156:156 -> b
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b2
-    1:1:boolean argumentsAreConsecutiveInputArguments():278 -> b2
-    2:2:boolean argumentsAreConsecutiveInputArguments():278:278 -> b2
+    1:1:boolean argumentsAreConsecutiveInputArguments():282 -> b2
+    2:2:boolean argumentsAreConsecutiveInputArguments():282:282 -> b2
     3:3:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b2
-    3:3:boolean argumentsAreConsecutiveInputArguments():281 -> b2
-    4:5:boolean argumentsAreConsecutiveInputArguments():281:282 -> b2
+    3:3:boolean argumentsAreConsecutiveInputArguments():285 -> b2
+    4:5:boolean argumentsAreConsecutiveInputArguments():285:286 -> b2
     6:6:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b2
-    6:6:boolean argumentsAreConsecutiveInputArguments():285 -> b2
-    7:7:boolean argumentsAreConsecutiveInputArguments():285:285 -> b2
+    6:6:boolean argumentsAreConsecutiveInputArguments():289 -> b2
+    7:7:boolean argumentsAreConsecutiveInputArguments():289:289 -> b2
     8:8:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> b2
-    8:8:boolean argumentsAreConsecutiveInputArguments():286 -> b2
-    9:10:boolean argumentsAreConsecutiveInputArguments():286:287 -> b2
-    1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):296:296 -> c
+    8:8:boolean argumentsAreConsecutiveInputArguments():290 -> b2
+    9:10:boolean argumentsAreConsecutiveInputArguments():290:291 -> b2
+    1:1:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):300:300 -> c
     2:2:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> c
-    2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):303 -> c
-    3:10:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):303:310 -> c
+    2:2:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):307 -> c
+    3:10:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):307:314 -> c
     11:11:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> c
-    11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):311 -> c
-    12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):311:312 -> c
+    11:11:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):315 -> c
+    12:13:boolean needsRangedInvoke(com.android.tools.r8.ir.conversion.DexBuilder):315:316 -> c
     com.android.tools.r8.graph.DexType getReturnType() -> c2
     com.android.tools.r8.ir.code.Invoke$Type getType() -> d2
     java.lang.String getTypeString() -> e2
-    1:1:int requiredArgumentRegisters():161:161 -> f2
+    1:1:int requiredArgumentRegisters():165:165 -> f2
     2:2:int com.android.tools.r8.ir.code.Value.requiredRegisters():259:259 -> f2
-    2:2:int requiredArgumentRegisters():162 -> f2
+    2:2:int requiredArgumentRegisters():166 -> f2
     boolean isInvoke() -> v1
-com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.ng$a:
+com.android.tools.r8.ir.code.Invoke$Type -> com.android.tools.r8.internal.Ag$a:
     com.android.tools.r8.ir.code.Invoke$Type NEW_ARRAY -> f
     com.android.tools.r8.ir.code.Invoke$Type MULTI_NEW_ARRAY -> g
     com.android.tools.r8.ir.code.Invoke$Type CUSTOM -> h
@@ -29945,7 +30219,7 @@
     56:59:com.android.tools.r8.graph.DexMethodHandle$MethodHandleType toMethodHandle(com.android.tools.r8.graph.DexMethod):92:95 -> a
     1:2:int getDexOpcode():76:77 -> b
     1:2:int getDexOpcodeRange():81:82 -> c
-com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.og:
+com.android.tools.r8.ir.code.InvokeCustom -> com.android.tools.r8.internal.Bg:
     com.android.tools.r8.graph.DexCallSite callSite -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():26:26 -> <clinit>
@@ -29990,7 +30264,7 @@
     java.lang.String getTypeString() -> e2
     1:1:com.android.tools.r8.graph.DexCallSite getCallSite():105:105 -> g2
     1:1:java.lang.String toString():120:120 -> toString
-com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.qg:
+com.android.tools.r8.ir.code.InvokeDirect -> com.android.tools.r8.internal.Dg:
     boolean isInterface -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():33:33 -> <clinit>
@@ -29999,7 +30273,7 @@
     int opcode() -> W1
     1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:95 -> a
     20:20:boolean isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):117:117 -> a
-    21:21:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    21:21:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
     21:21:boolean isInvokeConstructor(com.android.tools.r8.graph.DexItemFactory):117 -> a
     22:28:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):136:142 -> a
     29:36:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):141:148 -> a
@@ -30010,7 +30284,7 @@
     43:43:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):582:582 -> a
     43:43:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):177 -> a
     44:46:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178:180 -> a
-    47:47:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    47:47:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
     47:47:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180 -> a
     48:55:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181:188 -> a
     56:56:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeDirect):189:189 -> a
@@ -30024,7 +30298,7 @@
     7:14:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):203:210 -> f
     1:1:boolean getInterfaceBit():56:56 -> g2
     boolean isInvokeDirect() -> x1
-com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.sg:
+com.android.tools.r8.ir.code.InvokeInterface -> com.android.tools.r8.internal.Fg:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
@@ -30045,7 +30319,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():52:52 -> d2
     java.lang.String getTypeString() -> e2
     boolean getInterfaceBit() -> g2
-com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.tg:
+com.android.tools.r8.ir.code.InvokeMethod -> com.android.tools.r8.internal.Gg:
     boolean $assertionsDisabled -> i
     com.android.tools.r8.graph.DexMethod method -> j
     1:1:void <clinit>():36:36 -> <clinit>
@@ -30085,10 +30359,10 @@
     23:24:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.utils.collections.ProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):51:52 -> g
     23:24:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):93 -> g
     25:25:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):98:98 -> g
-    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> g
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> g
     26:26:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):97 -> g
     27:35:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):96:104 -> g
-    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> g
+    36:36:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> g
     36:36:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104 -> g
     37:53:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):104:120 -> g
     54:62:com.android.tools.r8.utils.collections.ProgramMethodSet lookupProgramDispatchTargets(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):118:126 -> g
@@ -30101,7 +30375,7 @@
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
     1:1:java.lang.String toString():63:63 -> toString
     boolean isInvokeMethod() -> y1
-com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.ug:
+com.android.tools.r8.ir.code.InvokeMethodWithReceiver -> com.android.tools.r8.internal.Hg:
     boolean $assertionsDisabled -> k
     1:1:void <clinit>():29:29 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):32:32 -> <init>
@@ -30122,7 +30396,7 @@
     188:188:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):134:134 -> a
     189:189:boolean verifyTypes(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.VerifyTypesHelper):130:130 -> a
     190:214:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):148:172 -> a
-    215:215:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    215:215:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     215:215:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
     216:216:boolean upperBoundAssumedByCallSiteOptimizationAndNoLongerInstantiated(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> a
     217:273:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):182:238 -> a
@@ -30138,7 +30412,7 @@
     171:171:boolean hasRefinedReceiverUpperBoundType(com.android.tools.r8.graph.AppView):43 -> c
     1:6:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):77:82 -> i
     1:2:com.android.tools.r8.ir.code.Value getReceiver():58:59 -> i2
-com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.vg:
+com.android.tools.r8.ir.code.InvokeMultiNewArray -> com.android.tools.r8.internal.Ig:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():25:25 -> <clinit>
@@ -30162,7 +30436,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):75:75 -> b
     3:24:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):117:138 -> b
-    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     25:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):141 -> b
     26:26:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     26:26:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):146 -> b
@@ -30175,7 +30449,7 @@
     1:1:java.util.List com.android.tools.r8.ir.code.Invoke.arguments():152:152 -> h2
     1:1:boolean instructionInstanceCanThrowNegativeArraySizeException():162 -> h2
     2:8:boolean instructionInstanceCanThrowNegativeArraySizeException():162:168 -> h2
-com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.wg:
+com.android.tools.r8.ir.code.InvokeNewArray -> com.android.tools.r8.internal.Jg:
     com.android.tools.r8.graph.DexType type -> j
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():25:25 -> <clinit>
@@ -30196,7 +30470,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):94:94 -> b
     3:24:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):144:165 -> b
-    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    25:25:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     25:25:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):168 -> b
     26:26:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     26:26:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):173 -> b
@@ -30208,7 +30482,7 @@
     1:1:com.android.tools.r8.errors.Unreachable cfUnsupported():139:139 -> g2
     1:1:com.android.tools.r8.graph.DexType getArrayType():50:50 -> h2
     1:1:java.lang.String toString():65:65 -> toString
-com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.xg:
+com.android.tools.r8.ir.code.InvokePolymorphic -> com.android.tools.r8.internal.Kg:
     boolean $assertionsDisabled -> k
     com.android.tools.r8.graph.DexProto proto -> l
     1:1:void <clinit>():29:29 -> <clinit>
@@ -30242,37 +30516,54 @@
     boolean getInterfaceBit() -> g2
     com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> i
     1:1:com.android.tools.r8.graph.DexProto getProto():69:69 -> i2
-com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Ag:
+com.android.tools.r8.ir.code.InvokeStatic -> com.android.tools.r8.internal.Ng:
+    boolean isInterface -> m
+    int $r8$clinit -> l
     boolean $assertionsDisabled -> k
-    boolean isInterface -> l
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:39 -> <init>
-    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):43:44 -> <init>
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):40:41 -> <init>
+    3:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List,boolean):45:46 -> <init>
     boolean isInvokeStatic() -> B1
     int opcode() -> W1
     com.android.tools.r8.ir.code.InvokeStatic asInvokeStatic() -> X
-    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):75:93 -> a
-    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):138:138 -> a
-    21:21:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):148:148 -> a
-    22:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):154:154 -> a
-    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):165:165 -> a
-    26:89:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):172:235 -> a
-    90:90:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):230:230 -> a
+    1:19:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):81:99 -> a
+    20:20:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):144:144 -> a
+    21:21:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.DefaultInliningOracle,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):154:154 -> a
+    22:24:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):160:160 -> a
+    25:25:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):171:171 -> a
+    26:89:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):178:241 -> a
+    90:90:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):236:236 -> a
     91:91:java.lang.Object com.android.tools.r8.ir.code.DefaultInstructionVisitor.visit(com.android.tools.r8.ir.code.InvokeStatic):214:214 -> a
-    91:91:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):59 -> a
-    92:92:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):234:234 -> a
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):98:98 -> b
-    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():64:64 -> d2
+    91:91:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):65 -> a
+    92:92:boolean lambda$instructionMayHaveSideEffects$0(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):240:240 -> a
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):104:104 -> b
+    1:1:com.android.tools.r8.ir.code.Invoke$Type getType():70:70 -> d2
     java.lang.String getTypeString() -> e2
-    1:1:boolean getInterfaceBit():49:49 -> g2
-    1:7:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):113:119 -> i
-    8:12:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):118:122 -> i
+    1:1:boolean getInterfaceBit():55:55 -> g2
+    1:7:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:125 -> i
+    8:12:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):124:128 -> i
     13:13:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89:89 -> i
-    13:13:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):122 -> i
+    13:13:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):128 -> i
     14:14:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> i
-    14:14:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):124 -> i
-    15:23:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):124:132 -> i
-com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Bg:
+    14:14:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):130 -> i
+    15:23:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):130:138 -> i
+com.android.tools.r8.ir.code.InvokeStatic$Builder -> com.android.tools.r8.internal.Ng$a:
+    java.util.List arguments -> e
+    com.android.tools.r8.graph.DexMethod method -> d
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():244:244 -> <clinit>
+    1:4:void <init>():244:247 -> <init>
+    com.android.tools.r8.ir.code.Instruction$BuilderBase self() -> a
+    1:1:com.android.tools.r8.ir.code.InvokeStatic$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):256:256 -> a
+    2:3:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic$Builder.setArguments(java.util.List):250:251 -> a
+    2:3:com.android.tools.r8.ir.code.InvokeStatic$Builder setSingleArgument(com.android.tools.r8.ir.code.Value):256 -> a
+    4:4:com.android.tools.r8.ir.code.InvokeStatic$Builder setMethod(com.android.tools.r8.graph.DexClassAndMethod):265:265 -> a
+    5:5:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic$Builder.setMethod(com.android.tools.r8.graph.DexMethod):260:260 -> a
+    5:5:com.android.tools.r8.ir.code.InvokeStatic$Builder setMethod(com.android.tools.r8.graph.DexClassAndMethod):265 -> a
+    1:5:com.android.tools.r8.ir.code.InvokeStatic build():270:274 -> b
+    6:7:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.code.Instruction$BuilderBase.amend(com.android.tools.r8.ir.code.Instruction):1557:1558 -> b
+    6:7:com.android.tools.r8.ir.code.InvokeStatic build():274 -> b
+com.android.tools.r8.ir.code.InvokeSuper -> com.android.tools.r8.internal.Og:
     boolean isInterface -> m
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():28:28 -> <clinit>
@@ -30295,7 +30586,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():54:54 -> d2
     java.lang.String getTypeString() -> e2
     1:1:boolean getInterfaceBit():39:39 -> g2
-com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Cg:
+com.android.tools.r8.ir.code.InvokeVirtual -> com.android.tools.r8.internal.Pg:
     boolean $assertionsDisabled -> l
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):33:33 -> <init>
@@ -30307,12 +30598,12 @@
     21:21:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement):106:106 -> a
     22:32:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):117:127 -> a
     33:45:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):122:134 -> a
-    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    46:46:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     46:46:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):135 -> a
     47:47:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     47:47:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):137 -> a
     48:51:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):137:140 -> a
-    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    52:52:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
     52:52:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):140 -> a
     53:53:com.android.tools.r8.graph.DexClassAndMethod lookupSingleTarget(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.DexMethod):146:146 -> a
     54:54:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):152:152 -> a
@@ -30324,7 +30615,7 @@
     1:1:com.android.tools.r8.ir.code.Invoke$Type getType():53:53 -> d2
     java.lang.String getTypeString() -> e2
     boolean getInterfaceBit() -> g2
-com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.lh:
+com.android.tools.r8.ir.code.JumpInstruction -> com.android.tools.r8.internal.yh:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():13:13 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -30339,48 +30630,49 @@
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock() -> a2
     1:1:void setFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):32:32 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.Vl:
+com.android.tools.r8.ir.code.LazyDominatorTree -> com.android.tools.r8.internal.im:
     com.android.tools.r8.ir.code.IRCode code -> b
     1:2:void <init>(com.android.tools.r8.ir.code.IRCode):13:14 -> <init>
     1:1:java.lang.Object get():9:9 -> a
     1:1:com.android.tools.r8.ir.code.DominatorTree get():19:19 -> c
     1:1:com.android.tools.r8.ir.code.DominatorTree lambda$get$0():19:19 -> d
-com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.ym:
+com.android.tools.r8.ir.code.LinearFlowInstructionListIterator -> com.android.tools.r8.internal.Lm:
     com.android.tools.r8.ir.code.IRCode code -> b
     com.android.tools.r8.ir.code.InstructionListIterator currentBlockIterator -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> c
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):25:25 -> <init>
-    2:10:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):28:36 -> <init>
-    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):42:42 -> a
-    2:2:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):48:48 -> a
-    3:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):53:53 -> a
-    4:4:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):58:58 -> a
-    5:5:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):64:64 -> a
-    6:6:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):75:75 -> a
-    7:7:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):82:82 -> a
-    8:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):87:87 -> a
-    9:9:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):98:98 -> a
-    10:13:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):113:116 -> a
-    14:24:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):147:157 -> a
-    1:1:void add(java.lang.Object):17:17 -> add
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):104:104 -> add
-    2:2:void add(java.lang.Object):17 -> add
-    1:1:void removeOrReplaceByDebugLocalRead():109:109 -> h
-    1:1:boolean hasNext():121:121 -> hasNext
-    1:4:boolean hasPrevious():162:165 -> hasPrevious
-    1:18:com.android.tools.r8.ir.code.Instruction next():126:143 -> l
-    1:1:java.lang.Object next():17:17 -> next
-    1:1:int nextIndex():187:187 -> nextIndex
-    1:1:java.lang.Object previous():17:17 -> previous
-    2:14:com.android.tools.r8.ir.code.Instruction previous():170:182 -> previous
-    1:1:int previousIndex():192:192 -> previousIndex
-    1:1:void remove():197:197 -> remove
-    1:1:void set(java.lang.Object):17:17 -> set
-    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):202:202 -> set
-    2:2:void set(java.lang.Object):17 -> set
-com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.Pm:
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):26:26 -> <init>
+    2:10:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,int):29:37 -> <init>
+    1:1:void replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction,java.util.Set):43:43 -> a
+    2:2:com.android.tools.r8.ir.code.Value insertConstNumberInstruction(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions,long,com.android.tools.r8.ir.analysis.type.TypeElement):49:49 -> a
+    3:3:com.android.tools.r8.ir.code.Value insertConstStringInstruction(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexString):54:54 -> a
+    4:4:void replaceCurrentInstructionWithConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DebugLocalInfo):60:60 -> a
+    5:5:void replaceCurrentInstructionWithConstInt(com.android.tools.r8.ir.code.IRCode,int):65:65 -> a
+    6:6:void replaceCurrentInstructionWithStaticGet(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexField,java.util.Set):71:71 -> a
+    7:7:void replaceCurrentInstructionWithThrowNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.Set):82:82 -> a
+    8:8:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,boolean):89:89 -> a
+    9:9:com.android.tools.r8.ir.code.BasicBlock split(com.android.tools.r8.ir.code.IRCode,int,java.util.ListIterator):94:94 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock inlineInvoke(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,com.android.tools.r8.graph.DexType):105:105 -> a
+    11:14:boolean isLinearEdge(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):120:123 -> a
+    15:25:com.android.tools.r8.ir.code.BasicBlock getBeginningOfTrivialLinearGotoChain(com.android.tools.r8.ir.code.BasicBlock):154:164 -> a
+    1:1:void add(java.lang.Object):18:18 -> add
+    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.add(com.android.tools.r8.ir.code.Instruction):111:111 -> add
+    2:2:void add(java.lang.Object):18 -> add
+    1:1:void removeOrReplaceByDebugLocalRead():116:116 -> h
+    1:1:boolean hasNext():128:128 -> hasNext
+    1:4:boolean hasPrevious():169:172 -> hasPrevious
+    1:18:com.android.tools.r8.ir.code.Instruction next():133:150 -> l
+    1:1:java.lang.Object next():18:18 -> next
+    1:1:int nextIndex():194:194 -> nextIndex
+    1:1:java.lang.Object previous():18:18 -> previous
+    2:14:com.android.tools.r8.ir.code.Instruction previous():177:189 -> previous
+    1:1:int previousIndex():199:199 -> previousIndex
+    1:1:void remove():204:204 -> remove
+    1:1:void set(java.lang.Object):18:18 -> set
+    2:2:void com.android.tools.r8.ir.code.LinearFlowInstructionListIterator.set(com.android.tools.r8.ir.code.Instruction):209:209 -> set
+    2:2:void set(java.lang.Object):18 -> set
+com.android.tools.r8.ir.code.Load -> com.android.tools.r8.internal.cn:
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value):23:23 -> <init>
     boolean hasInvariantOutType() -> N0
     int maxInValueRegister() -> U1
@@ -30399,7 +30691,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):52 -> b
     com.android.tools.r8.ir.code.Load asLoad() -> b0
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.Xm:
+com.android.tools.r8.ir.code.LogicalBinop -> com.android.tools.r8.internal.kn:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -30429,7 +30721,7 @@
     com.android.tools.r8.ir.code.LogicalBinop asLogicalBinop() -> c0
     com.android.tools.r8.code.Instruction CreateLong(int,int,int) -> d
     com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode() -> f2
-com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.do:
+com.android.tools.r8.ir.code.MemberType -> com.android.tools.r8.internal.po:
     com.android.tools.r8.ir.code.MemberType CHAR -> c
     com.android.tools.r8.ir.code.MemberType BOOLEAN_OR_BYTE -> b
     com.android.tools.r8.ir.code.MemberType INT -> e
@@ -30460,7 +30752,7 @@
     27:27:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
     28:28:com.android.tools.r8.ir.code.MemberType com.android.tools.r8.ir.code.MemberType.fromTypeDescriptorChar(char):82:82 -> a
     28:28:com.android.tools.r8.ir.code.MemberType fromDexType(com.android.tools.r8.graph.DexType):103 -> a
-com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.Qo:
+com.android.tools.r8.ir.code.Monitor -> com.android.tools.r8.internal.cp:
     com.android.tools.r8.ir.code.Monitor$Type type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -30489,14 +30781,14 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Monitor asMonitor() -> d0
     1:1:com.android.tools.r8.ir.code.Value object():45:45 -> f
-com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.Qo$a:
+com.android.tools.r8.ir.code.Monitor$Type -> com.android.tools.r8.internal.cp$a:
     com.android.tools.r8.ir.code.Monitor$Type ENTER -> a
     com.android.tools.r8.ir.code.Monitor$Type[] $VALUES -> c
     com.android.tools.r8.ir.code.Monitor$Type EXIT -> b
     1:1:void <clinit>():24:24 -> <clinit>
     2:2:void <clinit>():23:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):23:23 -> <init>
-com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.Ro:
+com.android.tools.r8.ir.code.Move -> com.android.tools.r8.internal.dp:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
@@ -30525,7 +30817,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Move asMove() -> e0
     1:1:java.lang.String toString():77:77 -> toString
-com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.To:
+com.android.tools.r8.ir.code.MoveException -> com.android.tools.r8.internal.fp:
     com.android.tools.r8.graph.DexType exceptionType -> i
     boolean $assertionsDisabled -> h
     com.android.tools.r8.utils.InternalOptions options -> j
@@ -30543,7 +30835,7 @@
     282:282:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
     283:284:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:48 -> a
     285:287:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:87 -> a
-    288:288:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    288:288:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     288:288:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> a
     289:289:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91:91 -> a
     290:290:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):89:89 -> a
@@ -30554,12 +30846,12 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> b
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):64 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67:67 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1791:1791 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTypeBug():1809:1809 -> b
     3:3:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):67 -> b
     4:4:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):68:68 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.MoveException asMoveException() -> f0
-com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.Vo:
+com.android.tools.r8.ir.code.Mul -> com.android.tools.r8.internal.hp:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
     int opcode() -> W1
     double foldDouble(double,double) -> a
@@ -30583,7 +30875,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():139:139 -> f2
     com.android.tools.r8.ir.code.Mul asMul() -> g0
-com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.yp:
+com.android.tools.r8.ir.code.Neg -> com.android.tools.r8.internal.Kp:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():21:21 -> <clinit>
@@ -30606,7 +30898,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):49:49 -> b
     com.android.tools.r8.ir.code.Neg asNeg() -> h0
-com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.Hp:
+com.android.tools.r8.ir.code.NewArrayEmpty -> com.android.tools.r8.internal.Tp:
     com.android.tools.r8.graph.DexType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
@@ -30623,7 +30915,7 @@
     3:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57 -> a
     4:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):57:58 -> a
     6:11:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):87:92 -> a
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     12:12:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):92 -> a
     13:13:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):95:95 -> a
     14:14:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):93:93 -> a
@@ -30639,7 +30931,7 @@
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.NewArrayEmpty asNewArrayEmpty() -> i0
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.Ip:
+com.android.tools.r8.ir.code.NewArrayFilledData -> com.android.tools.r8.internal.Up:
     long size -> j
     short[] data -> k
     int element_width -> i
@@ -30668,7 +30960,7 @@
     6:6:boolean instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):119:119 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.NewArrayFilledData asNewArrayFilledData() -> j0
-com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.Jp:
+com.android.tools.r8.ir.code.NewInstance -> com.android.tools.r8.internal.Vp:
     com.android.tools.r8.graph.DexType clazz -> i
     boolean allowSpilling -> j
     boolean $assertionsDisabled -> h
@@ -30692,7 +30984,7 @@
     9:9:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):131:131 -> a
     10:10:boolean definitelyTriggersClassInitialization(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$Query,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis$AnalysisAssumption):141:141 -> a
     11:25:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):148:162 -> a
-    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     26:26:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):162 -> a
     27:27:boolean instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction$SideEffectAssumption):163:163 -> a
     28:28:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
@@ -30711,9 +31003,9 @@
     9:17:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):216:224 -> d
     com.android.tools.r8.ir.code.NewInstance asNewInstance() -> k0
     1:1:java.lang.String toString():68:68 -> toString
-com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.Kp:
+com.android.tools.r8.ir.code.NextUntilIterator -> com.android.tools.r8.internal.Wp:
     1:3:java.lang.Object nextUntil(java.util.function.Predicate):19:21 -> a
-com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.gq:
+com.android.tools.r8.ir.code.Not -> com.android.tools.r8.internal.sq:
     com.android.tools.r8.ir.code.NumericType type -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
@@ -30735,7 +31027,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83 -> b
     2:2:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):83:83 -> b
     com.android.tools.r8.ir.code.Not asNot() -> l0
-com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.mq:
+com.android.tools.r8.ir.code.NumberConversion -> com.android.tools.r8.internal.yq:
     com.android.tools.r8.ir.code.NumericType to -> i
     com.android.tools.r8.ir.code.NumericType from -> h
     1:3:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):36:38 -> <init>
@@ -30765,12 +31057,12 @@
     244:244:boolean outTypeKnownToBeBoolean(java.util.Set):167:167 -> a
     1:5:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):138:142 -> b
     com.android.tools.r8.ir.code.NumberConversion asNumberConversion() -> m0
-com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.nq:
+com.android.tools.r8.ir.code.NumberGenerator -> com.android.tools.r8.internal.zq:
     int nextValueNumber -> a
     1:2:void <init>():6:7 -> <init>
     1:1:int next():10:10 -> a
     1:1:int peek():14:14 -> b
-com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.pq:
+com.android.tools.r8.ir.code.NumericType -> com.android.tools.r8.internal.Bq:
     com.android.tools.r8.ir.code.NumericType DOUBLE -> g
     com.android.tools.r8.ir.code.NumericType FLOAT -> f
     com.android.tools.r8.ir.code.NumericType LONG -> e
@@ -30796,7 +31088,7 @@
     52:52:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):49:49 -> a
     53:59:com.android.tools.r8.ir.code.NumericType fromDexType(com.android.tools.r8.graph.DexType):45:51 -> a
     60:60:boolean isWide():62:62 -> a
-com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.Qr:
+com.android.tools.r8.ir.code.Or -> com.android.tools.r8.internal.cs:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -30815,7 +31107,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):53:53 -> d
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():93:93 -> f2
     com.android.tools.r8.ir.code.Or asOr() -> n0
-com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.vs:
+com.android.tools.r8.ir.code.Phi -> com.android.tools.r8.internal.Hs:
     com.android.tools.r8.ir.code.Phi$RegisterReadType readType -> t
     java.util.List definitionUsers -> v
     java.util.List operands -> s
@@ -30898,38 +31190,40 @@
     5:5:void removeDeadPhi():324 -> l0
     6:6:void removeDeadPhi():324:324 -> l0
     1:1:boolean removeTrivialPhi():240:240 -> m0
-com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.vs$a:
+com.android.tools.r8.ir.code.Phi$RegisterReadType -> com.android.tools.r8.internal.Hs$a:
     com.android.tools.r8.ir.code.Phi$RegisterReadType NORMAL -> a
     com.android.tools.r8.ir.code.Phi$RegisterReadType DEBUG -> b
     1:2:void <clinit>():39:40 -> <clinit>
     1:1:void <init>(java.lang.String,int):38:38 -> <init>
-com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.vs$b:
+com.android.tools.r8.ir.code.Phi$StackMapPhi -> com.android.tools.r8.internal.Hs$b:
     boolean $assertionsDisabled -> w
     1:1:void <clinit>():455:455 -> <clinit>
     1:1:void <init>(int,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.code.Phi$RegisterReadType):463:463 -> <init>
     1:8:com.android.tools.r8.graph.DexType computeVerificationType(com.android.tools.r8.graph.AppView,com.android.tools.r8.cf.TypeVerificationHelper):468:475 -> a
     1:10:com.android.tools.r8.ir.analysis.type.TypeElement computePhiType(com.android.tools.r8.graph.AppView):481:490 -> d
-com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Es:
-    1:1:void <init>(com.android.tools.r8.ir.code.StackValue):20:20 -> <init>
+com.android.tools.r8.ir.code.Pop -> com.android.tools.r8.internal.Qs:
+    boolean $assertionsDisabled -> h
+    1:1:void <clinit>():17:17 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Value):20:21 -> <init>
     boolean hasInvariantOutType() -> N0
-    1:1:int maxInValueRegister():60:60 -> U1
-    1:1:int maxOutValueRegister():65:65 -> V1
+    1:1:int maxInValueRegister():61:61 -> U1
+    1:1:int maxOutValueRegister():66:66 -> V1
     int opcode() -> W1
     1:300:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget com.android.tools.r8.ir.optimize.InliningConstraints.forPop():0:299 -> a
-    1:300:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):71 -> a
-    301:301:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):30:30 -> a
-    302:302:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):76:76 -> a
-    303:303:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):81:81 -> a
+    1:300:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget inliningConstraint(com.android.tools.r8.ir.optimize.InliningConstraints,com.android.tools.r8.graph.ProgramMethod):72 -> a
+    301:301:java.lang.Object accept(com.android.tools.r8.ir.code.InstructionVisitor):31:31 -> a
+    302:302:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):77:77 -> a
+    303:303:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):82:82 -> a
     304:304:com.android.tools.r8.cf.code.CfStackInstruction com.android.tools.r8.cf.code.CfStackInstruction.popType(com.android.tools.r8.ir.code.ValueType):77:77 -> a
-    304:304:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):81 -> a
-    305:305:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):81:81 -> a
-    306:306:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):86:86 -> a
-    307:307:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):97:97 -> a
+    304:304:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):82 -> a
+    305:305:void buildCf(com.android.tools.r8.ir.conversion.CfBuilder):82:82 -> a
+    306:306:void insertLoadAndStores(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.cf.LoadStoreHelper):87:87 -> a
+    307:307:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):98:98 -> a
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isPop():0:0 -> b
-    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):55 -> b
-    2:6:void addInValue(com.android.tools.r8.ir.code.Value):35:39 -> b
+    1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):56 -> b
+    2:6:void addInValue(com.android.tools.r8.ir.code.Value):36:40 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Fs:
+com.android.tools.r8.ir.code.Position -> com.android.tools.r8.internal.Rs:
     com.android.tools.r8.ir.code.Position callerPosition -> i
     com.android.tools.r8.graph.DexString file -> f
     com.android.tools.r8.graph.DexMethod method -> h
@@ -30964,7 +31258,7 @@
     1:5:int hashCode():123:127 -> hashCode
     1:19:java.lang.String com.android.tools.r8.ir.code.Position.toString(boolean):145:163 -> toString
     1:19:java.lang.String toString():168 -> toString
-com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.Pw:
+com.android.tools.r8.ir.code.Rem -> com.android.tools.r8.internal.ix:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):24:24 -> <init>
     1:1:boolean instructionTypeCanThrow():134:134 -> T0
     int opcode() -> W1
@@ -30993,7 +31287,7 @@
     1:1:com.android.tools.r8.code.Instruction CreateLong(int,int,int):59:59 -> f
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():148:148 -> f2
     com.android.tools.r8.ir.code.Rem asRem() -> o0
-com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.mx:
+com.android.tools.r8.ir.code.Return -> com.android.tools.r8.internal.Fx:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -31017,7 +31311,7 @@
     1:1:boolean isReturnVoid():42:42 -> c2
     1:2:com.android.tools.r8.ir.code.Value returnValue():51:52 -> d2
     com.android.tools.r8.ir.code.Return asReturn() -> p0
-com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.Qx:
+com.android.tools.r8.ir.code.Shl -> com.android.tools.r8.internal.jy:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -31036,7 +31330,7 @@
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> f2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shl asShl() -> q0
-com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.Sx:
+com.android.tools.r8.ir.code.Shr -> com.android.tools.r8.internal.ly:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -31055,9 +31349,9 @@
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> f2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Shr asShr() -> r0
-com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.Xx:
+com.android.tools.r8.ir.code.SingleConstant -> com.android.tools.r8.internal.qy:
     int decodedValue() -> a
-com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.Cy:
+com.android.tools.r8.ir.code.StackValue -> com.android.tools.r8.internal.Vy:
     boolean $assertionsDisabled -> q
     int height -> r
     com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo typeInfo -> s
@@ -31070,7 +31364,7 @@
     1:1:int getHeight():31:31 -> h0
     1:1:com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo getTypeInfo():35:35 -> i0
     1:1:java.lang.String toString():59:59 -> toString
-com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.Dy:
+com.android.tools.r8.ir.code.StackValues -> com.android.tools.r8.internal.Wy:
     boolean $assertionsDisabled -> q
     com.android.tools.r8.ir.code.StackValue[] stackValues -> r
     1:1:void <clinit>():14:14 -> <clinit>
@@ -31081,7 +31375,7 @@
     1:1:com.android.tools.r8.ir.code.StackValue[] getStackValues():25:25 -> h0
     1:10:java.lang.String toString():40:49 -> toString
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getType():59:59 -> v
-com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.Jy:
+com.android.tools.r8.ir.code.StaticGet -> com.android.tools.r8.internal.cz:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):38:38 -> <init>
@@ -31127,7 +31421,7 @@
     1:1:com.android.tools.r8.ir.code.Value dest():63:63 -> d2
     com.android.tools.r8.ir.code.StaticGet asStaticGet() -> s0
     1:1:java.lang.String toString():178:178 -> toString
-com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.Ly:
+com.android.tools.r8.ir.code.StaticPut -> com.android.tools.r8.internal.ez:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():34:34 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexField):37:37 -> <init>
@@ -31164,7 +31458,7 @@
     10:18:boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):235:243 -> d
     com.android.tools.r8.ir.code.StaticPut asStaticPut() -> t0
     1:1:java.lang.String toString():188:188 -> toString
-com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.Ny:
+com.android.tools.r8.ir.code.Store -> com.android.tools.r8.internal.gz:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.StackValue):25:25 -> <init>
@@ -31187,7 +31481,7 @@
     1:2:boolean needsValueInRegister(com.android.tools.r8.ir.code.Value):113:114 -> c
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     com.android.tools.r8.ir.code.Store asStore() -> u0
-com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.hz:
+com.android.tools.r8.ir.code.StringSwitch -> com.android.tools.r8.internal.Az:
     boolean $assertionsDisabled -> l
     com.android.tools.r8.graph.DexString[] keys -> m
     1:1:void <clinit>():17:17 -> <clinit>
@@ -31212,7 +31506,7 @@
     5:5:java.lang.String toString():89 -> toString
     6:11:java.lang.String toString():89:94 -> toString
     com.android.tools.r8.ir.code.StringSwitch asStringSwitch() -> v0
-com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.Az:
+com.android.tools.r8.ir.code.Sub -> com.android.tools.r8.internal.Tz:
     boolean $assertionsDisabled -> j
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):27:27 -> <init>
@@ -31246,7 +31540,7 @@
     1:1:com.android.tools.r8.cf.code.CfArithmeticBinop$Opcode getCfOpcode():217:217 -> f2
     1:3:boolean negativeFitsInDexInstruction(com.android.tools.r8.ir.code.Value):123:125 -> i
     com.android.tools.r8.ir.code.Sub asSub() -> w0
-com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.Hz:
+com.android.tools.r8.ir.code.Swap -> com.android.tools.r8.internal.aA:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():19:19 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.StackValue,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):22:22 -> <init>
@@ -31265,7 +31559,7 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):77 -> b
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
     1:6:void setOutValue(com.android.tools.r8.ir.code.Value):44:49 -> e
-com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.Iz:
+com.android.tools.r8.ir.code.Switch -> com.android.tools.r8.internal.bA:
     boolean $assertionsDisabled -> i
     int fallthroughBlockIndex -> k
     int[] targetBlockIndices -> j
@@ -31291,7 +31585,7 @@
     5:5:boolean valid():29:29 -> e2
     1:1:com.android.tools.r8.ir.code.Value value():24:24 -> f2
     com.android.tools.r8.ir.code.Switch asSwitch() -> x0
-com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.mA:
+com.android.tools.r8.ir.code.Throw -> com.android.tools.r8.internal.EA:
     boolean $assertionsDisabled -> i
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.code.Value):20:20 -> <init>
@@ -31310,17 +31604,17 @@
     1:1:boolean identicalNonValueNonPositionParts(com.android.tools.r8.ir.code.Instruction):60:60 -> b
     1:1:com.android.tools.r8.ir.code.Value exception():34:34 -> b2
     com.android.tools.r8.ir.code.Throw asThrow() -> y0
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.zB:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier -> com.android.tools.r8.internal.TB:
     1:1:com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier create(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.graph.DebugLocalInfo):16:16 -> a
     com.android.tools.r8.graph.DebugLocalInfo getLocalInfo() -> b
     com.android.tools.r8.ir.analysis.type.TypeElement getOutType() -> d
-com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.yB:
+com.android.tools.r8.ir.code.TypeAndLocalInfoSupplier$1 -> com.android.tools.r8.internal.SB:
     com.android.tools.r8.ir.analysis.type.TypeElement val$type -> b
     com.android.tools.r8.graph.DebugLocalInfo val$local -> a
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo,com.android.tools.r8.ir.analysis.type.TypeElement):16:16 -> <init>
     1:1:com.android.tools.r8.graph.DebugLocalInfo getLocalInfo():20:20 -> b
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getOutType():25:25 -> d
-com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.eC:
+com.android.tools.r8.ir.code.Unop -> com.android.tools.r8.internal.zC:
     1:1:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     boolean hasInvariantOutType() -> N0
     boolean isUnop() -> T1
@@ -31332,7 +31626,7 @@
     331:331:com.android.tools.r8.ir.analysis.type.TypeElement evaluate(com.android.tools.r8.graph.AppView):62:62 -> a
     1:1:com.android.tools.r8.ir.code.Value source():25:25 -> a2
     boolean instructionMayTriggerMethodInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod) -> d
-com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.nC:
+com.android.tools.r8.ir.code.Ushr -> com.android.tools.r8.internal.MC:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):17:17 -> <init>
     int opcode() -> W1
     int foldIntegers(int,int) -> a
@@ -31351,7 +31645,7 @@
     1:1:com.android.tools.r8.cf.code.CfLogicalBinop$Opcode getCfOpcode():98:98 -> f2
     1:1:boolean fitsInDexInstruction(com.android.tools.r8.ir.code.Value):33:33 -> g
     com.android.tools.r8.ir.code.Ushr asUshr() -> z0
-com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.qC:
+com.android.tools.r8.ir.code.Value -> com.android.tools.r8.internal.RC:
     boolean isThis -> m
     com.android.tools.r8.ir.regalloc.LiveIntervals liveIntervals -> k
     int needsRegister -> l
@@ -31489,10 +31783,10 @@
     280:281:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1043 -> a
     282:289:void narrowing(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.TypeElement):1043:1050 -> a
     290:292:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1116:1118 -> a
-    293:293:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    293:293:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     293:293:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1119 -> a
     294:306:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1120:1132 -> a
-    307:307:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    307:307:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     307:307:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1133 -> a
     308:321:com.android.tools.r8.ir.analysis.type.ClassTypeElement getDynamicLowerBoundType(com.android.tools.r8.graph.AppView):1134:1147 -> a
     1:15:boolean onlyDependsOnArgument():848:862 -> a0
@@ -31578,12 +31872,14 @@
     1:1:boolean hasAliasedValue():200:200 -> x
     1:1:boolean hasAnyUsers():399:399 -> y
     1:1:boolean hasDebugUsers():403:403 -> z
-com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.qC$a:
+com.android.tools.r8.ir.code.Value$DebugData -> com.android.tools.r8.internal.RC$a:
     com.android.tools.r8.graph.DebugLocalInfo local -> a
     java.util.Set users -> b
     1:1:void <init>(com.android.tools.r8.graph.DebugLocalInfo):155:155 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.DebugLocalInfo):153:156 -> <init>
-com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.wC:
+com.android.tools.r8.ir.code.ValueFactory -> com.android.tools.r8.internal.SC:
+    1:1:com.android.tools.r8.ir.code.Value createValue(com.android.tools.r8.ir.analysis.type.TypeElement):13:13 -> a
+com.android.tools.r8.ir.code.ValueType -> com.android.tools.r8.internal.YC:
     com.android.tools.r8.ir.code.ValueType DOUBLE -> e
     com.android.tools.r8.ir.code.ValueType FLOAT -> c
     com.android.tools.r8.ir.code.ValueType LONG -> d
@@ -31630,7 +31926,7 @@
     13:13:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():131:131 -> d
     14:14:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():129:129 -> d
     15:15:com.android.tools.r8.ir.analysis.type.PrimitiveTypeElement toPrimitiveType():127:127 -> d
-com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.xC:
+com.android.tools.r8.ir.code.ValueTypeConstraint -> com.android.tools.r8.internal.ZC:
     com.android.tools.r8.ir.code.ValueTypeConstraint FLOAT -> c
     com.android.tools.r8.ir.code.ValueTypeConstraint INT -> b
     com.android.tools.r8.ir.code.ValueTypeConstraint OBJECT -> a
@@ -31678,9 +31974,9 @@
     76:78:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):155:157 -> a
     79:79:com.android.tools.r8.ir.code.ValueTypeConstraint fromTypeLattice(com.android.tools.r8.ir.analysis.type.TypeElement):137:137 -> a
     1:1:int requiredRegisters():42:42 -> b
-com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.TC:
+com.android.tools.r8.ir.code.WideConstant -> com.android.tools.r8.internal.JD:
     long decodedValue() -> a
-com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.cE:
+com.android.tools.r8.ir.code.Xor -> com.android.tools.r8.internal.SE:
     1:1:void <init>(com.android.tools.r8.ir.code.NumericType,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):18:18 -> <init>
     com.android.tools.r8.ir.code.Xor asXor() -> A0
     int opcode() -> W1
@@ -31941,18 +32237,18 @@
     2:2:void lambda$processInvokeWithDynamicDispatch$0(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexClassAndMethod):229:229 -> a
     3:5:void addClassInitializerTarget(com.android.tools.r8.graph.DexProgramClass):120:122 -> a
     6:13:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):135:142 -> a
-    14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():480:480 -> a
+    14:14:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():484:484 -> a
     14:14:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):142 -> a
     15:21:void addCallEdge(com.android.tools.r8.graph.ProgramMethod,boolean):146:152 -> a
     22:26:void addFieldReadEdge(com.android.tools.r8.graph.ProgramMethod):160:164 -> a
     27:44:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):168:185 -> a
-    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
+    45:45:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():476:476 -> a
     45:45:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185 -> a
     46:46:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):186:186 -> a
     47:53:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):185:191 -> a
     54:58:void processInvoke(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod):175:179 -> a
     59:60:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):198:199 -> a
-    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    61:61:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     61:61:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):199 -> a
     62:66:void processInvokeWithDynamicDispatch(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):201:205 -> a
     67:67:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
@@ -31970,48 +32266,48 @@
     632:632:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):314:314 -> a
     633:633:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):334:334 -> a
     634:634:void registerCallSite(com.android.tools.r8.graph.DexCallSite):367:367 -> a
-    635:669:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):83:117 -> a
+    635:669:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):86:120 -> a
     635:669:void registerCallSite(com.android.tools.r8.graph.DexCallSite):367 -> a
-    670:670:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):111:111 -> a
+    670:670:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):114:114 -> a
     670:670:void registerCallSite(com.android.tools.r8.graph.DexCallSite):367 -> a
-    671:677:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):108:114 -> a
+    671:677:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):111:117 -> a
     671:677:void registerCallSite(com.android.tools.r8.graph.DexCallSite):367 -> a
-    678:680:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):103:105 -> a
+    678:680:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):106:108 -> a
     678:680:void registerCallSite(com.android.tools.r8.graph.DexCallSite):367 -> a
-    681:684:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):97:100 -> a
+    681:684:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):100:103 -> a
     681:684:void registerCallSite(com.android.tools.r8.graph.DexCallSite):367 -> a
-    685:694:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):85:94 -> a
+    685:694:void com.android.tools.r8.graph.UseRegistry.registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):88:97 -> a
     685:694:void registerCallSite(com.android.tools.r8.graph.DexCallSite):367 -> a
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):324:324 -> b
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):319:319 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):339:339 -> c
-    1:1:void processInitClass(com.android.tools.r8.graph.DexType):294:294 -> d
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):304 -> d
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
-    2:2:void processInitClass(com.android.tools.r8.graph.DexType):294 -> d
-    2:2:void registerInitClass(com.android.tools.r8.graph.DexType):304 -> d
-    3:8:void processInitClass(com.android.tools.r8.graph.DexType):294:299 -> d
-    3:8:void registerInitClass(com.android.tools.r8.graph.DexType):304 -> d
-    9:9:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):329:329 -> d
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> e
+    1:1:void processInitClass(com.android.tools.r8.graph.DexType):294:294 -> c
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):304 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
+    2:2:void processInitClass(com.android.tools.r8.graph.DexType):294 -> c
+    2:2:void registerInitClass(com.android.tools.r8.graph.DexType):304 -> c
+    3:8:void processInitClass(com.android.tools.r8.graph.DexType):294:299 -> c
+    3:8:void registerInitClass(com.android.tools.r8.graph.DexType):304 -> c
+    9:9:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):319:319 -> c
+    10:10:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):339:339 -> c
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):329:329 -> d
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):309:309 -> e
-    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):351:351 -> e
-    1:2:void registerNewInstance(com.android.tools.r8.graph.DexType):344:345 -> f
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):356:356 -> g
-    1:2:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):127:128 -> h
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> h
-    3:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):128 -> h
-    4:6:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):128:130 -> h
+    2:3:void registerNewInstance(com.android.tools.r8.graph.DexType):344:345 -> e
+    4:4:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):351:351 -> e
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
+    1:2:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):127:128 -> g
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> g
+    3:3:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):128 -> g
+    4:6:void addClassInitializerTarget(com.android.tools.r8.graph.DexType):128:130 -> g
+    7:7:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):356:356 -> g
     1:10:void processFieldRead(com.android.tools.r8.graph.DexField):256:265 -> i
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> i
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> i
     11:11:void processFieldRead(com.android.tools.r8.graph.DexField):265 -> i
     12:12:void processFieldRead(com.android.tools.r8.graph.DexField):265:265 -> i
-    13:13:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> i
+    13:13:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> i
     13:13:void processFieldRead(com.android.tools.r8.graph.DexField):271 -> i
     14:20:void processFieldRead(com.android.tools.r8.graph.DexField):272:278 -> i
     1:2:void processFieldWrite(com.android.tools.r8.graph.DexField):284:285 -> j
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> j
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> j
     3:3:void processFieldWrite(com.android.tools.r8.graph.DexField):286 -> j
     4:4:void processFieldWrite(com.android.tools.r8.graph.DexField):288:288 -> j
 com.android.tools.r8.ir.conversion.CallSiteInformation -> com.android.tools.r8.ir.conversion.e:
@@ -32063,166 +32359,161 @@
     29:29:boolean com.android.tools.r8.ir.code.Instruction.isNot():0:0 -> a
     29:29:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteNots():232 -> a
     29:29:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137 -> a
-    30:34:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteNots():236:240 -> a
-    30:34:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    35:35:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteNots():240 -> a
-    35:35:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137 -> a
-    36:44:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteNots():241:249 -> a
-    36:44:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137 -> a
-    45:45:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteNots():248:248 -> a
-    45:45:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137 -> a
-    46:66:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):138:158 -> a
-    67:71:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():364:368 -> a
-    67:71:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    72:72:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> a
-    72:72:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():369 -> a
-    72:72:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    73:105:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():369:401 -> a
-    73:105:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    106:106:int com.android.tools.r8.ir.conversion.CfBuilder.getLocalRegister(com.android.tools.r8.ir.code.Value):634:634 -> a
-    106:106:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():401 -> a
+    30:43:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteNots():236:249 -> a
+    30:43:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137 -> a
+    44:44:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteNots():248:248 -> a
+    44:44:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):137 -> a
+    45:65:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):138:158 -> a
+    66:70:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():364:368 -> a
+    66:70:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
+    71:71:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> a
+    71:71:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():369 -> a
+    71:71:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
+    72:104:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():369:401 -> a
+    72:104:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
+    105:105:int com.android.tools.r8.ir.conversion.CfBuilder.getLocalRegister(com.android.tools.r8.ir.code.Value):634:634 -> a
+    105:105:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():401 -> a
+    105:105:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
+    106:106:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():401:401 -> a
     106:106:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    107:107:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():401:401 -> a
+    107:107:int com.android.tools.r8.ir.conversion.CfBuilder.getLocalRegister(com.android.tools.r8.ir.code.Value):634:634 -> a
+    107:107:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():401 -> a
     107:107:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    108:108:int com.android.tools.r8.ir.conversion.CfBuilder.getLocalRegister(com.android.tools.r8.ir.code.Value):634:634 -> a
-    108:108:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():401 -> a
-    108:108:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    109:127:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():402:420 -> a
-    109:127:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    128:128:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():398:398 -> a
+    108:126:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():402:420 -> a
+    108:126:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
+    127:127:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():398:398 -> a
+    127:127:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
+    128:128:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():393:393 -> a
     128:128:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    129:129:void com.android.tools.r8.ir.conversion.CfBuilder.rewriteIincPatterns():393:393 -> a
-    129:129:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):161 -> a
-    130:131:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):163:164 -> a
-    132:150:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():264:282 -> a
-    132:150:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    151:200:com.android.tools.r8.cf.code.CfTryCatch com.android.tools.r8.cf.code.CfTryCatch.fromBuilder(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.CatchHandlers,com.android.tools.r8.ir.conversion.CfBuilder):0:49 -> a
-    151:200:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():284 -> a
-    151:200:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    201:227:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():283:309 -> a
-    201:227:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    228:228:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
-    228:228:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():309 -> a
-    228:228:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    229:230:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():309:310 -> a
-    229:230:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    231:233:int com.android.tools.r8.ir.conversion.CfBuilder.stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):256:258 -> a
-    231:233:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():313 -> a
-    231:233:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    234:235:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):121:122 -> a
-    234:235:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():313 -> a
-    234:235:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    236:236:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):427:427 -> a
+    129:130:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):163:164 -> a
+    131:149:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():264:282 -> a
+    131:149:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    150:199:com.android.tools.r8.cf.code.CfTryCatch com.android.tools.r8.cf.code.CfTryCatch.fromBuilder(com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.cf.code.CfLabel,com.android.tools.r8.ir.code.CatchHandlers,com.android.tools.r8.ir.conversion.CfBuilder):0:49 -> a
+    150:199:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():284 -> a
+    150:199:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    200:226:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():283:309 -> a
+    200:226:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    227:227:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    227:227:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():309 -> a
+    227:227:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    228:229:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():309:310 -> a
+    228:229:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    230:232:int com.android.tools.r8.ir.conversion.CfBuilder.stackHeightAtBlockEntry(com.android.tools.r8.ir.code.BasicBlock):256:258 -> a
+    230:232:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():313 -> a
+    230:232:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    233:234:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.setHeight(int):121:122 -> a
+    233:234:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():313 -> a
+    233:234:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    235:235:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):427:427 -> a
+    235:235:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    235:235:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    236:236:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):355:355 -> a
+    236:236:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):428 -> a
     236:236:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
     236:236:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    237:237:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):355:355 -> a
+    237:237:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):344:344 -> a
+    237:237:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356 -> a
     237:237:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):428 -> a
     237:237:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
     237:237:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    238:238:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):344:344 -> a
+    238:238:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    238:238:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):345 -> a
     238:238:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356 -> a
     238:238:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):428 -> a
     238:238:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
     238:238:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    239:239:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    239:239:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):345 -> a
+    239:239:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    239:239:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):346 -> a
     239:239:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356 -> a
     239:239:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):428 -> a
     239:239:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
     239:239:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    240:240:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    240:240:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):346 -> a
+    240:240:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):348:348 -> a
     240:240:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356 -> a
     240:240:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):428 -> a
     240:240:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
     240:240:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    241:241:boolean com.android.tools.r8.ir.conversion.CfBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):348:348 -> a
-    241:241:boolean com.android.tools.r8.ir.conversion.CfBuilder.hasMaterializingInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):356 -> a
-    241:241:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):428 -> a
-    241:241:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    241:241:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    242:244:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):432:434 -> a
-    242:244:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    242:244:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    245:247:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):532:534 -> a
-    245:247:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):434 -> a
-    245:247:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    245:247:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    248:248:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
-    248:248:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):534 -> a
-    248:248:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):434 -> a
-    248:248:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    248:248:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    249:280:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):535:566 -> a
-    249:280:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):434 -> a
-    249:280:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    249:280:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    281:291:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):435:445 -> a
-    281:291:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    281:291:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    292:293:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.pop(com.android.tools.r8.ir.code.Value):116:117 -> a
-    292:293:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):445 -> a
-    292:293:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    292:293:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    294:301:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):448:455 -> a
-    294:301:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    294:301:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    302:302:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    302:302:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):459 -> a
-    302:302:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    302:302:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    303:308:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460:465 -> a
-    303:308:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    303:308:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    309:326:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):474:491 -> a
-    309:326:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):467 -> a
-    309:326:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
-    309:326:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    327:327:void com.android.tools.r8.ir.conversion.CfBuilder.add(com.android.tools.r8.cf.code.CfInstruction):638:638 -> a
-    327:327:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):491 -> a
+    241:243:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):432:434 -> a
+    241:243:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    241:243:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    244:246:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):532:534 -> a
+    244:246:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):434 -> a
+    244:246:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    244:246:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    247:247:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
+    247:247:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):534 -> a
+    247:247:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):434 -> a
+    247:247:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    247:247:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    248:279:void com.android.tools.r8.ir.conversion.CfBuilder.addFrame(com.android.tools.r8.ir.code.BasicBlock):535:566 -> a
+    248:279:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):434 -> a
+    248:279:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    248:279:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    280:290:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):435:445 -> a
+    280:290:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    280:290:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    291:292:void com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.pop(com.android.tools.r8.ir.code.Value):116:117 -> a
+    291:292:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):445 -> a
+    291:292:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    291:292:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    293:300:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):448:455 -> a
+    293:300:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    293:300:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    301:301:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    301:301:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):459 -> a
+    301:301:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    301:301:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    302:307:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):460:465 -> a
+    302:307:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    302:307:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    308:325:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):474:491 -> a
+    308:325:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):467 -> a
+    308:325:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    308:325:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    326:326:void com.android.tools.r8.ir.conversion.CfBuilder.add(com.android.tools.r8.cf.code.CfInstruction):638:638 -> a
+    326:326:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):491 -> a
+    326:326:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):467 -> a
+    326:326:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    326:326:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    327:327:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):492:492 -> a
     327:327:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):467 -> a
     327:327:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
     327:327:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    328:328:void com.android.tools.r8.ir.conversion.CfBuilder.updatePositionAndLocals(com.android.tools.r8.ir.code.Instruction):492:492 -> a
-    328:328:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):467 -> a
+    328:328:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):468:468 -> a
     328:328:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
     328:328:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    329:329:void com.android.tools.r8.ir.conversion.CfBuilder.buildCfInstructions(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,boolean,com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker):468:468 -> a
-    329:329:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():314 -> a
+    329:329:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():316:316 -> a
     329:329:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    330:330:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():316:316 -> a
+    330:330:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():106:106 -> a
+    330:330:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():316 -> a
     330:330:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    331:331:boolean com.android.tools.r8.ir.conversion.CfBuilder$StackHeightTracker.isEmpty():106:106 -> a
-    331:331:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():316 -> a
-    331:331:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    332:352:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():316:336 -> a
-    332:352:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
-    353:353:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166:166 -> a
-    354:361:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):172:179 -> a
-    354:361:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
-    362:362:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    362:362:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):179 -> a
+    331:351:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.conversion.CfBuilder.buildCfCode():316:336 -> a
+    331:351:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):165 -> a
+    352:352:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166:166 -> a
+    353:360:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):172:179 -> a
+    353:360:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
+    361:361:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    361:361:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):179 -> a
+    361:361:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
+    362:362:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):180:180 -> a
     362:362:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
-    363:363:boolean com.android.tools.r8.ir.conversion.CfBuilder.verifyInvokeInterface(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.AppView):180:180 -> a
-    363:363:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):166 -> a
-    364:364:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):167:167 -> a
-    365:371:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):215:221 -> a
-    372:375:boolean localsChanged():524:527 -> a
-    376:377:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):570:571 -> a
-    378:383:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580:585 -> a
-    378:383:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
-    384:384:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
-    384:384:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):585 -> a
-    384:384:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
-    385:414:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):584:613 -> a
-    385:414:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
-    415:415:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):574:574 -> a
-    416:416:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):590:590 -> a
-    416:416:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
-    417:419:void emitLabel(com.android.tools.r8.cf.code.CfLabel):621:623 -> a
-    420:420:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):630:630 -> a
-    421:421:void add(com.android.tools.r8.cf.code.CfInstruction):638:638 -> a
+    363:363:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.optimize.DeadCodeRemover):167:167 -> a
+    364:370:java.util.List computeInitializers(com.android.tools.r8.ir.code.Value):215:221 -> a
+    371:374:boolean localsChanged():524:527 -> a
+    375:376:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):570:571 -> a
+    377:382:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):580:585 -> a
+    377:382:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
+    383:383:com.android.tools.r8.graph.DexType com.android.tools.r8.cf.TypeVerificationHelper$NewInstanceInfo.getDexType():70:70 -> a
+    383:383:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):585 -> a
+    383:383:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
+    384:413:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):584:613 -> a
+    384:413:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
+    414:414:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):574:574 -> a
+    415:415:com.android.tools.r8.cf.code.CfFrame$FrameType com.android.tools.r8.ir.conversion.CfBuilder.findAllocator(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):590:590 -> a
+    415:415:com.android.tools.r8.cf.code.CfFrame$FrameType getFrameType(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.cf.TypeVerificationHelper$TypeInfo):573 -> a
+    416:418:void emitLabel(com.android.tools.r8.cf.code.CfLabel):621:623 -> a
+    419:419:com.android.tools.r8.cf.code.CfLabel getLabel(com.android.tools.r8.ir.code.BasicBlock):630:630 -> a
+    420:420:void add(com.android.tools.r8.cf.code.CfInstruction):638:638 -> a
     1:20:void updateLocals(com.android.tools.r8.cf.code.CfLabel):497:516 -> b
     21:26:void updateLocals(com.android.tools.r8.cf.code.CfLabel):515:520 -> b
     27:27:com.android.tools.r8.cf.code.CfLabel lambda$getLabel$0(com.android.tools.r8.ir.code.BasicBlock):630:630 -> b
@@ -32236,7 +32527,7 @@
     1:3:void <init>():101:103 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.conversion.CfBuilder$1):101:101 -> <init>
     1:3:void push(com.android.tools.r8.ir.code.Value):110:112 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.p4:
+com.android.tools.r8.ir.conversion.CfSourceCode -> com.android.tools.r8.internal.q4:
     com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo currentBlockInfo -> c
     com.android.tools.r8.graph.ProgramMethod method -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap incomingState -> v
@@ -32279,7 +32570,7 @@
     5:5:boolean com.android.tools.r8.ir.conversion.CfSourceCode.canThrowHelper(com.android.tools.r8.cf.code.CfInstruction,boolean):308:308 -> a
     5:5:boolean canThrowHelper(com.android.tools.r8.cf.code.CfInstruction):300 -> a
     6:8:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):313:315 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     9:9:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):315 -> a
     10:12:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):315:315 -> a
     14:38:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):317:341 -> a
@@ -32301,7 +32592,7 @@
     151:179:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):350 -> a
     180:187:com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList getTryHandlers(int,com.android.tools.r8.graph.DexItemFactory):350:357 -> a
     188:200:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):398:410 -> a
-    201:201:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
+    201:201:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():393:393 -> a
     201:201:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410 -> a
     202:214:void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder):410:422 -> a
     215:228:void com.android.tools.r8.ir.conversion.CfSourceCode.buildMethodEnterSynchronization(com.android.tools.r8.ir.conversion.IRBuilder):438:451 -> a
@@ -32418,13 +32709,13 @@
     2:5:java.lang.Iterable lambda$getCanonicalDebugPositionAtOffset$2():880:883 -> j
     1:1:boolean localsChanged():786:786 -> k
     1:10:void setLocalVariableLists():773:782 -> l
-com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.n4:
+com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList -> com.android.tools.r8.internal.o4:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap locals -> c
     int endOffset -> b
     int startOffset -> a
     1:4:void <init>(int,int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):145:148 -> <init>
     1:19:com.android.tools.r8.ir.conversion.CfSourceCode$LocalVariableList compute(int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):158:176 -> a
-com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.o4:
+com.android.tools.r8.ir.conversion.CfSourceCode$TryHandlerList -> com.android.tools.r8.internal.p4:
     java.util.List guards -> d
     boolean $assertionsDisabled -> a
     int startOffset -> b
@@ -32433,13 +32724,15 @@
     1:1:void <clinit>():70:70 -> <clinit>
     1:5:void <init>(int,int,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):77:81 -> <init>
     1:2:boolean isEmpty():89:90 -> a
-com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.q4:
+com.android.tools.r8.ir.conversion.CfSourceUtils -> com.android.tools.r8.internal.r4:
     1:1:com.android.tools.r8.cf.code.CfInstruction com.android.tools.r8.ir.conversion.CfSourceUtils.getLastInstruction(java.util.List):24:24 -> a
     1:1:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):14 -> a
     2:2:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
     2:2:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):15 -> a
     3:6:com.android.tools.r8.cf.code.CfLabel ensureLabel(java.util.List):16:19 -> a
-com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.w4:
+    7:13:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):187:193 -> a
+    7:13:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):107 -> a
+com.android.tools.r8.ir.conversion.CfState -> com.android.tools.r8.internal.x4:
     com.android.tools.r8.ir.conversion.CfState$Snapshot current -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.Position position -> c
@@ -32473,8 +32766,8 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():201:201 -> c
     1:2:com.android.tools.r8.ir.conversion.CfState$Slot pop():187:188 -> d
     1:1:java.lang.String toString():236:236 -> toString
-com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.s4:
-com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.t4:
+com.android.tools.r8.ir.conversion.CfState$1 -> com.android.tools.r8.internal.t4:
+com.android.tools.r8.ir.conversion.CfState$BaseSnapshot -> com.android.tools.r8.internal.u4:
     com.android.tools.r8.ir.conversion.CfState$SlotType[] locals -> d
     com.android.tools.r8.ir.conversion.CfState$SlotType[] stack -> e
     boolean $assertionsDisabled -> c
@@ -32497,7 +32790,7 @@
     5:5:com.android.tools.r8.ir.conversion.CfState$Slot peek():390:390 -> c
     1:1:int stackHeight():374:374 -> d
     1:15:java.lang.String toString():419:433 -> toString
-com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.u4:
+com.android.tools.r8.ir.conversion.CfState$Pop -> com.android.tools.r8.internal.v4:
     int stackHeight -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():476:476 -> <clinit>
@@ -32506,7 +32799,7 @@
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():499:499 -> c
     1:1:int stackHeight():488:488 -> d
     1:1:java.lang.String toString():504:504 -> toString
-com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.v4:
+com.android.tools.r8.ir.conversion.CfState$Push -> com.android.tools.r8.internal.w4:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():437:437 -> <clinit>
@@ -32533,7 +32826,7 @@
     2:2:int com.android.tools.r8.ir.conversion.CfState$Slot.access$500(com.android.tools.r8.ir.conversion.CfState$Slot):239 -> d
     2:2:int stackHeight():449 -> d
     1:1:java.lang.String toString():472:472 -> toString
-com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.w4$a:
+com.android.tools.r8.ir.conversion.CfState$Slot -> com.android.tools.r8.internal.x4$a:
     com.android.tools.r8.ir.code.ValueType type -> c
     com.android.tools.r8.ir.conversion.CfState$SlotType slotType -> e
     com.android.tools.r8.graph.DexType preciseType -> d
@@ -32550,24 +32843,24 @@
     6:6:boolean com.android.tools.r8.ir.conversion.CfState$SlotType.isPrecise():0:0 -> a
     6:6:boolean isPrecise():284 -> a
     1:3:java.lang.String toString():270:272 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.z4:
+com.android.tools.r8.ir.conversion.CfState$SlotType -> com.android.tools.r8.internal.A4:
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.conversion.CfState$1):14:14 -> <init>
     com.android.tools.r8.ir.code.ValueType getImprecise() -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
-com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.x4:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Imprecise -> com.android.tools.r8.internal.y4:
     com.android.tools.r8.ir.code.ValueType type -> a
     1:2:void <init>(com.android.tools.r8.ir.code.ValueType):56:57 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():67:67 -> a
     com.android.tools.r8.graph.DexType getPrecise() -> b
     1:1:java.lang.String toString():72:72 -> toString
-com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.y4:
+com.android.tools.r8.ir.conversion.CfState$SlotType$Precise -> com.android.tools.r8.internal.z4:
     com.android.tools.r8.graph.DexType type -> a
     1:2:void <init>(com.android.tools.r8.graph.DexType):27:28 -> <init>
     1:1:com.android.tools.r8.ir.code.ValueType getImprecise():38:38 -> a
     1:1:com.android.tools.r8.graph.DexType getPrecise():33:33 -> b
     1:1:java.lang.String toString():43:43 -> toString
-com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.A4:
+com.android.tools.r8.ir.conversion.CfState$Snapshot -> com.android.tools.r8.internal.B4:
     com.android.tools.r8.ir.conversion.CfState$Snapshot parent -> a
     int updates -> b
     1:1:void <init>(com.android.tools.r8.ir.conversion.CfState$Snapshot,int,com.android.tools.r8.ir.conversion.CfState$1):288:288 -> <init>
@@ -32579,7 +32872,7 @@
     2:2:com.android.tools.r8.ir.conversion.CfState$Slot getStack(int):306:306 -> b
     1:1:com.android.tools.r8.ir.conversion.CfState$Slot peek():310:310 -> c
     1:1:int stackHeight():298:298 -> d
-com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.B4:
+com.android.tools.r8.ir.conversion.CfState$Write -> com.android.tools.r8.internal.C4:
     com.android.tools.r8.ir.conversion.CfState$Slot slot -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():508:508 -> <clinit>
@@ -32588,9 +32881,9 @@
     2:3:void build(com.android.tools.r8.ir.conversion.CfState$BaseSnapshot):530:531 -> a
     1:1:int maxLocal():520:520 -> b
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.internal.x6:
+com.android.tools.r8.ir.conversion.CodeOptimization -> com.android.tools.r8.internal.C6:
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId) -> a
-com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.C8:
+com.android.tools.r8.ir.conversion.DexBuilder -> com.android.tools.r8.internal.H8:
     boolean hasBackwardsBranch -> n
     int inRegisterCount -> l
     int outRegisterCount -> m
@@ -32606,368 +32899,368 @@
     java.util.List switchPayloadInfos -> e
     com.android.tools.r8.ir.regalloc.RegisterAllocator registerAllocator -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():83:83 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):125:126 -> <init>
-    3:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):129:129 -> <init>
-    4:43:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):95:134 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83:83 -> a
-    2:2:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):83:83 -> a
-    3:3:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):83:83 -> a
-    4:7:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):142:145 -> a
-    8:10:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):150:152 -> a
-    11:11:boolean com.android.tools.r8.ir.conversion.DexBuilder.isBuildingForComparison():156:156 -> a
-    11:11:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):643 -> a
-    12:13:void com.android.tools.r8.ir.conversion.DexBuilder.setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):677:678 -> a
-    12:13:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):645 -> a
-    14:20:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):648:654 -> a
-    21:25:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):669:673 -> a
-    21:25:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):655 -> a
-    26:26:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):659:659 -> a
-    26:26:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):673 -> a
-    26:26:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):655 -> a
-    27:27:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):673:673 -> a
-    27:27:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):655 -> a
-    28:56:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):335:363 -> a
-    57:59:boolean com.android.tools.r8.ir.conversion.DexBuilder.isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):325:327 -> a
-    57:59:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):364 -> a
-    60:85:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):366:391 -> a
+    1:1:void <clinit>():82:82 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):124:125 -> <init>
+    3:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):128:128 -> <init>
+    4:43:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,com.android.tools.r8.utils.InternalOptions):94:133 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.DexBuilder$Info access$000(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82:82 -> a
+    2:2:com.android.tools.r8.ir.conversion.DexBuilder$Info access$100(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.Instruction):82:82 -> a
+    3:3:boolean access$202(com.android.tools.r8.ir.conversion.DexBuilder,boolean):82:82 -> a
+    4:7:boolean identicalInstructionsAfterBuildingDexCode(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.regalloc.RegisterAllocator):141:144 -> a
+    8:10:com.android.tools.r8.ir.conversion.DexBuilder$Info buildInfoForComparison(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder):149:151 -> a
+    11:11:boolean com.android.tools.r8.ir.conversion.DexBuilder.isBuildingForComparison():155:155 -> a
+    11:11:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):642 -> a
+    12:13:void com.android.tools.r8.ir.conversion.DexBuilder.setSingleInfo(com.android.tools.r8.ir.conversion.DexBuilder$Info):676:677 -> a
+    12:13:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):644 -> a
+    14:20:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):647:653 -> a
+    21:25:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):668:672 -> a
+    21:25:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):654 -> a
+    26:26:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):658:658 -> a
+    26:26:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):672 -> a
+    26:26:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):654 -> a
+    27:27:void com.android.tools.r8.ir.conversion.DexBuilder.setInfo(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):672:672 -> a
+    27:27:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.conversion.DexBuilder$Info):654 -> a
+    28:56:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):334:362 -> a
+    57:59:boolean com.android.tools.r8.ir.conversion.DexBuilder.isTrivialFallthroughTarget(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):324:326 -> a
+    57:59:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):363 -> a
+    60:85:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):365:390 -> a
     86:86:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
-    86:86:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):391 -> a
-    87:93:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):392:398 -> a
+    86:86:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):390 -> a
+    87:93:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):391:397 -> a
     94:94:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    94:94:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):399 -> a
-    95:115:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):401:421 -> a
+    94:94:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):398 -> a
+    95:115:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):400:420 -> a
     116:116:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
-    116:116:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):421 -> a
-    117:117:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):424:424 -> a
+    116:116:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):420 -> a
+    117:117:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):423:423 -> a
     118:118:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    118:118:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):425 -> a
-    119:119:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):426:426 -> a
-    120:120:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):584:584 -> a
-    120:120:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
-    121:123:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):592:594 -> a
-    121:123:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):586 -> a
-    121:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
-    124:124:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):587:587 -> a
-    124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):427 -> a
-    125:138:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):429:442 -> a
+    118:118:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):424 -> a
+    119:119:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):425:425 -> a
+    120:120:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):583:583 -> a
+    120:120:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):426 -> a
+    121:123:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNonMaterializingConstNumber(com.android.tools.r8.ir.code.Instruction):591:593 -> a
+    121:123:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):585 -> a
+    121:123:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):426 -> a
+    124:124:boolean com.android.tools.r8.ir.conversion.DexBuilder.isNopInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlock):586:586 -> a
+    124:124:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):426 -> a
+    125:138:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):428:441 -> a
     139:139:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
-    139:139:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):443 -> a
-    140:169:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):445:474 -> a
-    170:181:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():490:501 -> a
-    170:181:com.android.tools.r8.graph.DexCode build():184 -> a
-    182:186:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():500:504 -> a
-    182:186:com.android.tools.r8.graph.DexCode build():184 -> a
-    187:187:com.android.tools.r8.graph.DexCode build():188:188 -> a
-    188:193:void com.android.tools.r8.ir.conversion.DexBuilder.reset():160:165 -> a
-    188:193:com.android.tools.r8.graph.DexCode build():191 -> a
-    194:194:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):659:659 -> a
-    194:194:void com.android.tools.r8.ir.conversion.DexBuilder.reset():165 -> a
-    194:194:com.android.tools.r8.graph.DexCode build():191 -> a
-    195:198:void com.android.tools.r8.ir.conversion.DexBuilder.reset():165:168 -> a
-    195:198:com.android.tools.r8.graph.DexCode build():191 -> a
-    199:240:com.android.tools.r8.graph.DexCode build():196:237 -> a
-    241:241:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1727:1727 -> a
-    241:241:com.android.tools.r8.graph.DexCode build():237 -> a
-    242:285:com.android.tools.r8.graph.DexCode build():238:281 -> a
-    286:305:com.android.tools.r8.code.Nop com.android.tools.r8.ir.conversion.DexBuilder.createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):711:730 -> a
-    286:305:com.android.tools.r8.graph.DexCode build():284 -> a
-    306:320:com.android.tools.r8.graph.DexCode build():285:299 -> a
+    139:139:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):442 -> a
+    140:169:void removeRedundantDebugPositions(com.android.tools.r8.ir.code.IRCode):444:473 -> a
+    170:181:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():489:500 -> a
+    170:181:com.android.tools.r8.graph.DexCode build():183 -> a
+    182:186:void com.android.tools.r8.ir.conversion.DexBuilder.rewriteIfs():499:503 -> a
+    182:186:com.android.tools.r8.graph.DexCode build():183 -> a
+    187:187:com.android.tools.r8.graph.DexCode build() -> a
+    188:193:void com.android.tools.r8.ir.conversion.DexBuilder.reset():159:164 -> a
+    188:193:com.android.tools.r8.graph.DexCode build():190 -> a
+    194:194:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):658:658 -> a
+    194:194:void com.android.tools.r8.ir.conversion.DexBuilder.reset():164 -> a
+    194:194:com.android.tools.r8.graph.DexCode build():190 -> a
+    195:198:void com.android.tools.r8.ir.conversion.DexBuilder.reset():164:167 -> a
+    195:198:com.android.tools.r8.graph.DexCode build():190 -> a
+    199:240:com.android.tools.r8.graph.DexCode build():195:236 -> a
+    241:241:boolean com.android.tools.r8.utils.InternalOptions.canHaveTracingPastInstructionsStreamBug():1745:1745 -> a
+    241:241:com.android.tools.r8.graph.DexCode build():236 -> a
+    242:285:com.android.tools.r8.graph.DexCode build():237:280 -> a
+    286:305:com.android.tools.r8.code.Nop com.android.tools.r8.ir.conversion.DexBuilder.createSwitchPayload(com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo,int):710:729 -> a
+    286:305:com.android.tools.r8.graph.DexCode build():283 -> a
+    306:320:com.android.tools.r8.graph.DexCode build():284:298 -> a
     321:371:com.android.tools.r8.code.FillArrayDataPayload com.android.tools.r8.ir.code.NewArrayFilledData.createPayload():0:50 -> a
-    321:371:com.android.tools.r8.graph.DexCode build():299 -> a
-    372:375:com.android.tools.r8.graph.DexCode build():300:303 -> a
-    376:378:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():737:739 -> a
-    376:378:com.android.tools.r8.graph.DexCode build():307 -> a
-    379:384:com.android.tools.r8.graph.DexCode$Try[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryItems(java.util.List,java.util.Map):840:845 -> a
-    379:384:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():741 -> a
-    379:384:com.android.tools.r8.graph.DexCode build():307 -> a
-    385:385:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():742:742 -> a
-    385:385:com.android.tools.r8.graph.DexCode build():307 -> a
-    386:403:com.android.tools.r8.graph.DexCode$TryHandler[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryHandlers(java.util.Map):851:868 -> a
-    386:403:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():742 -> a
-    386:403:com.android.tools.r8.graph.DexCode build():307 -> a
-    404:412:com.android.tools.r8.graph.DexCode build():310:318 -> a
-    413:414:void requestOutgoingRegisters(int):514:515 -> a
-    415:415:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):520:520 -> a
-    416:419:void addGoto(com.android.tools.r8.ir.code.Goto):530:533 -> a
-    420:434:boolean com.android.tools.r8.ir.conversion.DexBuilder.needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):538:552 -> a
-    420:434:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):562 -> a
-    435:437:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):563:565 -> a
-    438:439:void addIf(com.android.tools.r8.ir.code.If):570:571 -> a
-    440:440:void addMove(com.android.tools.r8.ir.code.Move):575:575 -> a
-    441:441:void com.android.tools.r8.ir.conversion.DexBuilder.addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
-    441:441:void addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):604 -> a
-    442:442:void addNop(com.android.tools.r8.ir.code.Instruction):598:598 -> a
-    443:444:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):608:609 -> a
-    445:446:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):613:614 -> a
-    447:449:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):618:620 -> a
-    450:451:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):624:625 -> a
-    452:453:void addArgument(com.android.tools.r8.ir.code.Argument):629:630 -> a
-    454:458:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):634:638 -> a
-    459:470:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):682:693 -> a
-    471:476:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.DexBuilder.computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):701:706 -> a
-    471:476:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694 -> a
-    477:480:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):694:697 -> a
-    481:555:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):748:822 -> a
-    1:1:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):510:510 -> b
-    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):83 -> b
-    2:2:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):526:526 -> b
-    3:3:void addNothing(com.android.tools.r8.ir.code.Instruction):579:579 -> b
-    4:11:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):828:835 -> b
-    12:12:com.android.tools.r8.utils.InternalOptions getOptions():874:874 -> b
-    1:2:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):664:665 -> c
-    3:3:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):659:659 -> c
-    3:3:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):665 -> c
-    4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):665:665 -> c
-    5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():878:878 -> c
-    1:1:boolean isBuildingForComparison():156:156 -> d
-com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.s8:
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1047:1047 -> <init>
+    321:371:com.android.tools.r8.graph.DexCode build():298 -> a
+    372:375:com.android.tools.r8.graph.DexCode build():299:302 -> a
+    376:378:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():736:738 -> a
+    376:378:com.android.tools.r8.graph.DexCode build():306 -> a
+    379:384:com.android.tools.r8.graph.DexCode$Try[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryItems(java.util.List,java.util.Map):839:844 -> a
+    379:384:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():740 -> a
+    379:384:com.android.tools.r8.graph.DexCode build():306 -> a
+    385:385:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():741:741 -> a
+    385:385:com.android.tools.r8.graph.DexCode build():306 -> a
+    386:403:com.android.tools.r8.graph.DexCode$TryHandler[] com.android.tools.r8.ir.conversion.DexBuilder.getDexTryHandlers(java.util.Map):850:867 -> a
+    386:403:com.android.tools.r8.ir.conversion.DexBuilder$TryInfo com.android.tools.r8.ir.conversion.DexBuilder.computeTryInfo():741 -> a
+    386:403:com.android.tools.r8.graph.DexCode build():306 -> a
+    404:412:com.android.tools.r8.graph.DexCode build():309:317 -> a
+    413:414:void requestOutgoingRegisters(int):513:514 -> a
+    415:415:int allocatedRegister(com.android.tools.r8.ir.code.Value,int):519:519 -> a
+    416:419:void addGoto(com.android.tools.r8.ir.code.Goto):529:532 -> a
+    420:434:boolean com.android.tools.r8.ir.conversion.DexBuilder.needsNopBetweenMoveAndInstanceOf(com.android.tools.r8.code.InstanceOf):537:551 -> a
+    420:434:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):561 -> a
+    435:437:void addInstanceOf(com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.code.InstanceOf):562:564 -> a
+    438:439:void addIf(com.android.tools.r8.ir.code.If):569:570 -> a
+    440:440:void addMove(com.android.tools.r8.ir.code.Move):574:574 -> a
+    441:441:void com.android.tools.r8.ir.conversion.DexBuilder.addNop(com.android.tools.r8.ir.code.Instruction):597:597 -> a
+    441:441:void addDebugPosition(com.android.tools.r8.ir.code.DebugPosition):603 -> a
+    442:442:void addNop(com.android.tools.r8.ir.code.Instruction):597:597 -> a
+    443:444:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):607:608 -> a
+    445:446:void add(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):612:613 -> a
+    447:449:void addSwitch(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):617:619 -> a
+    450:451:void addFillArrayData(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):623:624 -> a
+    452:453:void addArgument(com.android.tools.r8.ir.code.Argument):628:629 -> a
+    454:458:void addReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.code.Instruction):633:637 -> a
+    459:470:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):681:692 -> a
+    471:476:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.conversion.DexBuilder.computeNextBlock(com.android.tools.r8.ir.code.BasicBlock):700:705 -> a
+    471:476:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):693 -> a
+    477:480:com.android.tools.r8.ir.conversion.DexBuilder$Info getTargetInfo(com.android.tools.r8.ir.code.BasicBlock):693:696 -> a
+    481:555:java.util.List computeTryItems(com.android.tools.r8.com.google.common.collect.BiMap):747:821 -> a
+    1:1:void com.android.tools.r8.ir.conversion.DexBuilder.needsIfRewriting(com.android.tools.r8.ir.code.BasicBlock):509:509 -> b
+    1:1:void access$300(com.android.tools.r8.ir.conversion.DexBuilder,com.android.tools.r8.ir.code.BasicBlock):82 -> b
+    2:2:int argumentOrAllocateRegister(com.android.tools.r8.ir.code.Value,int):525:525 -> b
+    3:3:void addNothing(com.android.tools.r8.ir.code.Instruction):578:578 -> b
+    4:11:int trimEnd(com.android.tools.r8.ir.code.BasicBlock):827:834 -> b
+    12:12:com.android.tools.r8.utils.InternalOptions getOptions():873:873 -> b
+    1:2:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):663:664 -> c
+    3:3:int com.android.tools.r8.ir.conversion.DexBuilder.instructionNumberToIndex(int):658:658 -> c
+    3:3:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):664 -> c
+    4:4:com.android.tools.r8.ir.conversion.DexBuilder$Info getInfo(com.android.tools.r8.ir.code.Instruction):664:664 -> c
+    5:5:com.android.tools.r8.ir.regalloc.RegisterAllocator getRegisterAllocator():877:877 -> c
+    1:1:boolean isBuildingForComparison():155:155 -> d
+com.android.tools.r8.ir.conversion.DexBuilder$FallThroughInfo -> com.android.tools.r8.internal.x8:
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):1046:1046 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1076:1076 -> a
+    1:1:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1075:1075 -> a
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.t8:
+com.android.tools.r8.ir.conversion.DexBuilder$FillArrayDataInfo -> com.android.tools.r8.internal.y8:
     com.android.tools.r8.code.FillArrayData dex -> b
     com.android.tools.r8.ir.code.NewArrayFilledData ir -> a
-    1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1522:1524 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.u8:
+    1:3:void <init>(com.android.tools.r8.ir.code.NewArrayFilledData,com.android.tools.r8.code.FillArrayData):1521:1523 -> <init>
+com.android.tools.r8.ir.conversion.DexBuilder$FixedSizeInfo -> com.android.tools.r8.internal.z8:
     com.android.tools.r8.code.Instruction instruction -> e
-    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):954:955 -> <init>
-    1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):975:976 -> a
-    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):981:981 -> a
-    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):986:987 -> a
-    1:1:int getSize():960:960 -> d
-    1:1:int maxSize():970:970 -> e
-    1:1:int minSize():965:965 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.v8:
+    1:2:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction):953:954 -> <init>
+    1:2:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):974:975 -> a
+    3:3:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):980:980 -> a
+    4:5:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):985:986 -> a
+    1:1:int getSize():959:959 -> d
+    1:1:int maxSize():969:969 -> e
+    1:1:int minSize():964:964 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo -> com.android.tools.r8.internal.A8:
     boolean $assertionsDisabled -> e
     int size -> f
-    1:1:void <clinit>():1080:1080 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1085:1085 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1082:1082 -> <init>
-    1:1:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1089:1089 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1153 -> a
-    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1154:1198 -> a
-    47:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1187:1191 -> a
-    52:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1182:1201 -> a
-    72:72:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1112:1112 -> a
-    73:73:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1089:1089 -> a
-    73:73:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1113 -> a
-    74:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1114:1148 -> a
-    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1207:1207 -> a
-    1:2:int getSize():1094:1095 -> d
-    1:1:int maxSize():1106:1106 -> e
-    1:1:int minSize():1100:1100 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.w8:
+    1:1:void <clinit>():1079:1079 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Goto):1084:1084 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Goto):1081:1081 -> <init>
+    1:1:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1088:1088 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1152 -> a
+    2:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1153:1197 -> a
+    47:51:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1186:1190 -> a
+    52:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1181:1200 -> a
+    72:72:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1111:1111 -> a
+    73:73:com.android.tools.r8.ir.code.Goto com.android.tools.r8.ir.conversion.DexBuilder$GotoInfo.getJump():1088:1088 -> a
+    73:73:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1112 -> a
+    74:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1113:1147 -> a
+    109:109:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1206:1206 -> a
+    1:2:int getSize():1093:1094 -> d
+    1:1:int maxSize():1105:1105 -> e
+    1:1:int minSize():1099:1099 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$IfInfo -> com.android.tools.r8.internal.B8:
     boolean $assertionsDisabled -> e
     int size -> f
-    1:1:void <clinit>():1211:1211 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.If):1216:1216 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.If):1213:1213 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    1:1:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1257 -> a
-    2:2:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1257 -> a
-    3:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1258:1268 -> a
-    14:14:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    14:14:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    14:14:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
-    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268 -> a
-    15:15:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    15:15:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
-    15:15:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268 -> a
-    16:17:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1237:1238 -> a
-    16:17:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268 -> a
-    18:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1268:1275 -> a
-    26:26:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    26:26:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    26:26:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1276 -> a
-    27:27:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    27:27:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1276 -> a
-    28:45:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1276:1293 -> a
-    46:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1290:1290 -> a
-    47:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1287:1287 -> a
-    48:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1284:1284 -> a
-    49:49:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1281:1281 -> a
-    50:69:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1278:1297 -> a
-    70:70:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    70:70:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    70:70:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1298 -> a
-    71:71:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    71:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1298 -> a
-    72:89:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1298:1315 -> a
-    90:90:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1312:1312 -> a
-    91:91:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1309:1309 -> a
-    92:92:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1306:1306 -> a
-    93:93:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1303:1303 -> a
-    94:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1300:1300 -> a
-    95:95:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1211:1211 -> a
-    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1319 -> a
-    96:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1319:1320 -> a
-    98:98:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    98:98:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    98:98:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1242 -> a
-    98:98:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    99:99:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    99:99:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1242 -> a
-    99:99:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    100:100:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1242:1242 -> a
-    100:100:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    101:101:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getMaxOffset():1211:1211 -> a
-    101:101:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1243 -> a
-    101:101:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    102:102:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1244:1244 -> a
-    102:102:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    103:103:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1211:1211 -> a
-    103:103:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1246 -> a
-    103:103:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    104:104:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1246:1246 -> a
-    104:104:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    105:105:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1211:1211 -> a
-    105:105:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1251 -> a
-    105:105:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    106:106:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1211:1211 -> a
-    106:106:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1252 -> a
-    106:106:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
-    107:107:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    107:107:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    107:107:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1326 -> a
-    108:108:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    108:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1326 -> a
-    109:109:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1326:1326 -> a
-    110:110:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    110:110:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    110:110:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
-    110:110:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    111:111:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    111:111:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236 -> a
-    111:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    112:113:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1237:1238 -> a
-    112:113:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328 -> a
-    114:114:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1328:1328 -> a
-    115:115:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    115:115:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    115:115:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1220 -> a
-    116:116:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    116:116:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1220 -> a
-    117:117:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1221:1221 -> a
-    118:121:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1349:1352 -> a
-    122:122:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    122:122:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    122:122:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
-    123:123:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    123:123:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
-    124:124:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353:1353 -> a
-    125:125:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> a
-    125:125:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> a
-    125:125:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
-    126:126:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> a
-    126:126:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353 -> a
-    127:128:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1353:1354 -> a
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1211:1211 -> b
-    1:1:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232 -> b
-    1:1:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1225 -> b
-    2:2:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1232:1232 -> b
-    2:2:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1225 -> b
-    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1225:1228 -> b
-    1:1:int getSize():1344:1344 -> d
+    1:1:void <clinit>():1210:1210 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.If):1215:1215 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.If):1212:1212 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    1:1:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1256 -> a
+    2:2:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1256 -> a
+    3:13:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1257:1267 -> a
+    14:14:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    14:14:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    14:14:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1235 -> a
+    14:14:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1267 -> a
+    15:15:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    15:15:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1235 -> a
+    15:15:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1267 -> a
+    16:17:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236:1237 -> a
+    16:17:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1267 -> a
+    18:25:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1267:1274 -> a
+    26:26:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    26:26:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    26:26:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1275 -> a
+    27:27:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    27:27:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1275 -> a
+    28:45:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1275:1292 -> a
+    46:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1289:1289 -> a
+    47:47:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1286:1286 -> a
+    48:48:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1283:1283 -> a
+    49:49:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1280:1280 -> a
+    50:69:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1277:1296 -> a
+    70:70:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    70:70:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    70:70:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1297 -> a
+    71:71:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    71:71:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1297 -> a
+    72:89:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1297:1314 -> a
+    90:90:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1311:1311 -> a
+    91:91:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1308:1308 -> a
+    92:92:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1305:1305 -> a
+    93:93:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1302:1302 -> a
+    94:94:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1299:1299 -> a
+    95:95:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1210:1210 -> a
+    95:95:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1318 -> a
+    96:97:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1318:1319 -> a
+    98:98:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    98:98:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    98:98:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1241 -> a
+    98:98:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    99:99:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    99:99:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1241 -> a
+    99:99:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    100:100:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1241:1241 -> a
+    100:100:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    101:101:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getMaxOffset():1210:1210 -> a
+    101:101:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1242 -> a
+    101:101:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    102:102:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1243:1243 -> a
+    102:102:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    103:103:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1210:1210 -> a
+    103:103:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1245 -> a
+    103:103:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    104:104:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1245:1245 -> a
+    104:104:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    105:105:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1210:1210 -> a
+    105:105:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1250 -> a
+    105:105:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    106:106:int com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getOffset():1210:1210 -> a
+    106:106:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.offsetOutOfRange(com.android.tools.r8.ir.conversion.DexBuilder):1251 -> a
+    106:106:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1324 -> a
+    107:107:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    107:107:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    107:107:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    108:108:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    108:108:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325 -> a
+    109:109:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1325:1325 -> a
+    110:110:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    110:110:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    110:110:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1235 -> a
+    110:110:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1327 -> a
+    111:111:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    111:111:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1235 -> a
+    111:111:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1327 -> a
+    112:113:boolean com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.branchesToSelf(com.android.tools.r8.ir.conversion.DexBuilder):1236:1237 -> a
+    112:113:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1327 -> a
+    114:114:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1327:1327 -> a
+    115:115:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    115:115:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    115:115:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1219 -> a
+    116:116:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    116:116:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1219 -> a
+    117:117:int getRegister(int,com.android.tools.r8.ir.conversion.DexBuilder):1220:1220 -> a
+    118:121:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1348:1351 -> a
+    122:122:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    122:122:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    122:122:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1352 -> a
+    123:123:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    123:123:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1352 -> a
+    124:124:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1352:1352 -> a
+    125:125:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> a
+    125:125:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> a
+    125:125:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1352 -> a
+    126:126:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> a
+    126:126:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1352 -> a
+    127:128:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1352:1353 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getIR():1210:1210 -> b
+    1:1:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231 -> b
+    1:1:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1224 -> b
+    2:2:com.android.tools.r8.ir.code.If com.android.tools.r8.ir.conversion.DexBuilder$IfInfo.getBranch():1231:1231 -> b
+    2:2:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1224 -> b
+    3:6:int[] getRegisters(com.android.tools.r8.ir.conversion.DexBuilder):1224:1227 -> b
+    1:1:int getSize():1343:1343 -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.x8:
+com.android.tools.r8.ir.conversion.DexBuilder$Info -> com.android.tools.r8.internal.C8:
     com.android.tools.r8.ir.code.Instruction ir -> b
     int maxOffset -> d
     boolean $assertionsDisabled -> a
     int offset -> c
-    1:1:void <clinit>():882:882 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):891:891 -> <init>
-    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):886:893 -> <init>
+    1:1:void <clinit>():881:881 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Instruction):890:890 -> <init>
+    2:9:void <init>(com.android.tools.r8.ir.code.Instruction):885:892 -> <init>
     void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List) -> a
     int computeSize(com.android.tools.r8.ir.conversion.DexBuilder) -> a
     boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder) -> a
-    1:2:void setMaxOffset(int):938:939 -> a
-    3:3:com.android.tools.r8.ir.code.Instruction getIR():943:943 -> a
-    1:1:void setMinOffset(int):928:928 -> b
-    2:3:int getMaxOffset():933:934 -> b
-    1:2:int getOffset():913:914 -> c
-    3:4:void setOffset(int):918:919 -> c
+    1:2:void setMaxOffset(int):937:938 -> a
+    3:3:com.android.tools.r8.ir.code.Instruction getIR():942:942 -> a
+    1:1:void setMinOffset(int):927:927 -> b
+    2:3:int getMaxOffset():932:933 -> b
+    1:2:int getOffset():912:913 -> c
+    3:4:void setOffset(int):917:918 -> c
     int getSize() -> d
     int maxSize() -> e
     int minSize() -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.y8:
+com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo -> com.android.tools.r8.internal.D8:
     boolean $assertionsDisabled -> e
     int size -> f
-    1:1:void <clinit>():1358:1358 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.code.Move):1363:1363 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Move):1360:1360 -> <init>
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1358:1358 -> a
-    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367 -> a
-    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406 -> a
-    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367:1367 -> a
-    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406 -> a
-    3:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1407:1450 -> a
-    47:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1428:1435 -> a
-    55:63:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1414:1422 -> a
-    64:64:int com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getOffset():1358:1358 -> a
-    64:64:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1452 -> a
-    65:66:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1452:1453 -> a
-    67:67:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1424:1424 -> a
-    68:73:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1380:1385 -> a
-    74:85:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1390:1401 -> a
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1358:1358 -> b
-    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367 -> b
-    1:1:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
-    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367:1367 -> b
-    2:2:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
-    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375:1375 -> b
-    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1358:1358 -> b
-    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367 -> b
-    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
-    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367:1367 -> b
-    5:5:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375 -> b
-    6:6:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1375:1375 -> b
-    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1358:1358 -> c
-    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367 -> c
-    1:1:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
-    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367:1367 -> c
-    2:2:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
-    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371:1371 -> c
-    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1358:1358 -> c
-    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367 -> c
-    4:4:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
-    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1367:1367 -> c
-    5:5:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371 -> c
-    6:6:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1371:1371 -> c
-    1:2:int getSize():1470:1471 -> d
-    1:1:int maxSize():1464:1464 -> e
-    1:1:int minSize():1458:1458 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.z8:
+    1:1:void <clinit>():1357:1357 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.code.Move):1362:1362 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Move):1359:1359 -> <init>
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1357:1357 -> a
+    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366 -> a
+    1:1:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1405 -> a
+    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366:1366 -> a
+    2:2:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1405 -> a
+    3:46:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1406:1449 -> a
+    47:54:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1427:1434 -> a
+    55:63:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1413:1421 -> a
+    64:64:int com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getOffset():1357:1357 -> a
+    64:64:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1451 -> a
+    65:66:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1451:1452 -> a
+    67:67:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1423:1423 -> a
+    68:73:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1379:1384 -> a
+    74:85:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1389:1400 -> a
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1357:1357 -> b
+    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366 -> b
+    1:1:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> b
+    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366:1366 -> b
+    2:2:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> b
+    3:3:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374:1374 -> b
+    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1357:1357 -> b
+    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366 -> b
+    4:4:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> b
+    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366:1366 -> b
+    5:5:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374 -> b
+    6:6:int destRegister(com.android.tools.r8.ir.conversion.DexBuilder):1374:1374 -> b
+    1:1:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1357:1357 -> c
+    1:1:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366 -> c
+    1:1:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1370 -> c
+    2:2:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366:1366 -> c
+    2:2:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1370 -> c
+    3:3:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1370:1370 -> c
+    4:4:com.android.tools.r8.ir.code.Instruction com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getIR():1357:1357 -> c
+    4:4:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366 -> c
+    4:4:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1370 -> c
+    5:5:com.android.tools.r8.ir.code.Move com.android.tools.r8.ir.conversion.DexBuilder$MoveInfo.getMove():1366:1366 -> c
+    5:5:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1370 -> c
+    6:6:int srcRegister(com.android.tools.r8.ir.conversion.DexBuilder):1370:1370 -> c
+    1:2:int getSize():1469:1470 -> d
+    1:1:int maxSize():1463:1463 -> e
+    1:1:int minSize():1457:1457 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$MultiFixedSizeInfo -> com.android.tools.r8.internal.E8:
     int size -> f
     com.android.tools.r8.code.Instruction[] instructions -> e
-    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):998:1004 -> <init>
-    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1009:1009 -> a
-    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1014:1018 -> a
-    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1039:1040 -> a
-    1:1:int getSize():1034:1034 -> d
-    1:1:int maxSize():1029:1029 -> e
-    1:1:int minSize():1024:1024 -> f
-com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.A8:
+    1:7:void <init>(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.code.Instruction[]):997:1003 -> <init>
+    1:1:int computeSize(com.android.tools.r8.ir.conversion.DexBuilder):1008:1008 -> a
+    2:6:void addInstructions(com.android.tools.r8.ir.conversion.DexBuilder,java.util.List):1013:1017 -> a
+    7:8:boolean identicalInstructions(com.android.tools.r8.ir.conversion.DexBuilder$Info,com.android.tools.r8.ir.conversion.DexBuilder):1038:1039 -> a
+    1:1:int getSize():1033:1033 -> d
+    1:1:int maxSize():1028:1028 -> e
+    1:1:int minSize():1023:1023 -> f
+com.android.tools.r8.ir.conversion.DexBuilder$SwitchPayloadInfo -> com.android.tools.r8.internal.F8:
     com.android.tools.r8.ir.code.IntSwitch ir -> a
     com.android.tools.r8.code.Format31t dex -> b
-    1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1511:1513 -> <init>
-com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.B8:
+    1:3:void <init>(com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.code.Format31t):1510:1512 -> <init>
+com.android.tools.r8.ir.conversion.DexBuilder$TryItem -> com.android.tools.r8.internal.G8:
     com.android.tools.r8.ir.code.CatchHandlers handlers -> a
     int start -> b
     int end -> c
-    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1494:1497 -> <init>
-    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1502:1502 -> a
-    1:1:int compareTo(java.lang.Object):1488:1488 -> compareTo
-    2:2:int com.android.tools.r8.ir.conversion.DexBuilder$TryItem.compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1502:1502 -> compareTo
-    2:2:int compareTo(java.lang.Object):1488 -> compareTo
-com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.K8:
+    1:4:void <init>(com.android.tools.r8.ir.code.CatchHandlers,int,int):1493:1496 -> <init>
+    1:1:int compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1501:1501 -> a
+    1:1:int compareTo(java.lang.Object):1487:1487 -> compareTo
+    2:2:int com.android.tools.r8.ir.conversion.DexBuilder$TryItem.compareTo(com.android.tools.r8.ir.conversion.DexBuilder$TryItem):1501:1501 -> compareTo
+    2:2:int compareTo(java.lang.Object):1487 -> compareTo
+com.android.tools.r8.ir.conversion.DexSourceCode -> com.android.tools.r8.internal.S8:
     com.android.tools.r8.ir.code.CatchHandlers currentCatchHandlers -> h
     com.android.tools.r8.ir.code.Position currentPosition -> j
     com.android.tools.r8.graph.DexMethod originalMethod -> m
@@ -33039,31 +33332,31 @@
     1:1:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):392:392 -> i
     2:2:boolean com.android.tools.r8.ir.conversion.DexSourceCode.inTryRange(com.android.tools.r8.graph.DexCode$Try,int):387:387 -> i
     2:2:com.android.tools.r8.graph.DexCode$Try getTryForOffset(int):393 -> i
-com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.ha:
+com.android.tools.r8.ir.conversion.ExtraConstantIntParameter -> com.android.tools.r8.internal.qa:
     long value -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(long):15:16 -> <init>
     1:2:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):21:22 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):27:27 -> a
-com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.ia:
+com.android.tools.r8.ir.conversion.ExtraParameter -> com.android.tools.r8.internal.ra:
     1:1:void <init>():12:12 -> <init>
     com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView) -> a
-com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.ja:
+com.android.tools.r8.ir.conversion.ExtraUnusedNullParameter -> com.android.tools.r8.internal.sa:
     1:1:void <init>():13:13 -> <init>
     1:1:com.android.tools.r8.ir.analysis.type.TypeElement getTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):17:17 -> a
     2:2:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22:22 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue com.android.tools.r8.ir.analysis.value.AbstractValueFactory.createNullValue():35:35 -> a
     3:3:com.android.tools.r8.ir.analysis.value.SingleNumberValue getValue(com.android.tools.r8.graph.AppView):22 -> a
-com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Aa:
+com.android.tools.r8.ir.conversion.FieldOptimizationFeedback -> com.android.tools.r8.internal.Ja:
     void markFieldAsPropagated(com.android.tools.r8.graph.DexEncodedField) -> a
     void markFieldBitsRead(com.android.tools.r8.graph.DexEncodedField,int) -> a
     void markFieldHasDynamicLowerBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.ClassTypeElement) -> a
     void markFieldHasDynamicUpperBoundType(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.type.TypeElement) -> a
     void recordFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.value.AbstractValue) -> a
     void markFieldCannotBeKept(com.android.tools.r8.graph.DexEncodedField) -> b
-com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.lc:
+com.android.tools.r8.ir.conversion.IRBuilder -> com.android.tools.r8.internal.uc:
     com.android.tools.r8.ir.conversion.SourceCode source -> v
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap targets -> b
     java.util.List argumentValues -> t
@@ -33245,34 +33538,34 @@
     311:311:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
     312:319:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():794:801 -> a
     312:319:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    320:320:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():31:31 -> a
+    320:320:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():33:33 -> a
     320:320:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():802 -> a
     320:320:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
-    321:321:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> a
+    321:321:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> a
     321:321:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():803 -> a
     321:321:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
     322:322:void com.android.tools.r8.ir.conversion.IRBuilder.insertDebugPositions():804:804 -> a
     322:322:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):667 -> a
     323:324:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):670:671 -> a
-    325:325:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
+    325:325:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
     325:325:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):671 -> a
     326:328:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):672:674 -> a
-    329:329:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():31:31 -> a
+    329:329:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():33:33 -> a
     329:329:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):674 -> a
     330:335:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):675:680 -> a
-    336:336:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> a
+    336:336:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> a
     336:336:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):681 -> a
     337:338:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):688:689 -> a
     339:369:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2686:2716 -> a
     339:369:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    370:370:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
+    370:370:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
     370:370:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2716 -> a
     370:370:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
     371:371:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2716:2716 -> a
     371:371:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
     372:386:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2715:2729 -> a
     372:386:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
-    387:398:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):547:558 -> a
+    387:398:void com.android.tools.r8.ir.code.BasicBlock.removePredecessorsByIndex(java.util.List):549:560 -> a
     387:398:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2733 -> a
     387:398:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
     399:399:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2734:2734 -> a
@@ -33285,7 +33578,7 @@
     402:446:void com.android.tools.r8.ir.conversion.IRBuilder.joinPredecessorsWithIdenticalPhis():2692:2736 -> a
     402:446:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):694 -> a
     447:461:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):697:711 -> a
-    462:462:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1197:1197 -> a
+    462:462:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(com.android.tools.r8.ir.conversion.IRBuilder):1194:1194 -> a
     462:462:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):714 -> a
     463:477:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):715:729 -> a
     478:478:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
@@ -33296,7 +33589,7 @@
     481:481:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):725 -> a
     482:482:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):725:725 -> a
     483:506:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):720:743 -> a
-    507:507:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1474:1474 -> a
+    507:507:boolean com.android.tools.r8.utils.InternalOptions.isStringSwitchConversionEnabled():1492:1492 -> a
     507:507:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):743 -> a
     508:508:com.android.tools.r8.ir.code.IRCode build(com.android.tools.r8.graph.ProgramMethod):744:744 -> a
     509:520:java.util.List com.android.tools.r8.ir.conversion.StringSwitchConverter.getRewritingCandidates(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):127:138 -> a
@@ -33374,7 +33667,7 @@
     654:654:void addConstString(int,com.android.tools.r8.graph.DexString):1277:1277 -> a
     655:655:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271:1271 -> a
     655:655:void addConstString(int,com.android.tools.r8.graph.DexString):1278 -> a
-    656:656:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    656:656:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     656:656:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271 -> a
     656:656:void addConstString(int,com.android.tools.r8.graph.DexString):1278 -> a
     657:658:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1272:1273 -> a
@@ -33383,7 +33676,7 @@
     660:660:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1284:1284 -> a
     661:661:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271:1271 -> a
     661:661:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1285 -> a
-    662:662:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    662:662:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     662:662:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1271 -> a
     662:662:void addDexItemBasedConstString(int,com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo):1285 -> a
     663:664:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.conversion.IRBuilder.throwingInfoForConstStrings():1272:1273 -> a
@@ -33683,7 +33976,7 @@
     82:85:void addTrivialIf(int,int):1410:1413 -> b
     86:89:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1501:1504 -> b
     90:90:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1667:1667 -> b
-    91:91:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
+    91:91:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> b
     91:91:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1667 -> b
     92:98:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1667:1673 -> b
     99:103:void addNewArrayEmpty(int,int,com.android.tools.r8.graph.DexType):1800:1804 -> b
@@ -34011,8 +34304,8 @@
     11:13:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2104:2106 -> v
     14:14:void com.android.tools.r8.ir.conversion.IRBuilder.addInstruction(com.android.tools.r8.ir.code.Instruction):2409:2409 -> v
     14:14:void addXorLiteral(com.android.tools.r8.ir.code.NumericType,int,int,int):2107 -> v
-com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.lc$a:
-com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.lc$b:
+com.android.tools.r8.ir.conversion.IRBuilder$1 -> com.android.tools.r8.internal.uc$a:
+com.android.tools.r8.ir.conversion.IRBuilder$BlockInfo -> com.android.tools.r8.internal.uc$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalPredecessors -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet exceptionalSuccessors -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet normalPredecessors -> b
@@ -34020,7 +34313,7 @@
     com.android.tools.r8.ir.code.BasicBlock block -> a
     1:7:void <init>():271:277 -> <init>
     1:25:java.lang.String toString():341:365 -> toString
-com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.lc$c:
+com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem -> com.android.tools.r8.internal.uc$c:
     com.android.tools.r8.graph.DexType guard -> d
     int targetOffset -> f
     int sourceOffset -> e
@@ -34029,7 +34322,7 @@
     1:1:int access$600(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> a
     1:1:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> b
     1:1:int access$800(com.android.tools.r8.ir.conversion.IRBuilder$MoveExceptionWorklistItem):195:195 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.lc$d:
+com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem -> com.android.tools.r8.internal.uc$d:
     int sourceOffset -> d
     int targetOffset -> e
     com.android.tools.r8.ir.code.Position position -> f
@@ -34037,13 +34330,13 @@
     1:1:int access$200(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> a
     1:1:int access$300(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> b
     1:1:com.android.tools.r8.ir.code.Position access$500(com.android.tools.r8.ir.conversion.IRBuilder$SplitBlockWorklistItem):210:210 -> c
-com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.lc$e:
+com.android.tools.r8.ir.conversion.IRBuilder$ValueList -> com.android.tools.r8.internal.uc$e:
     java.util.List values -> a
     1:3:void <init>():233:235 -> <init>
     1:3:com.android.tools.r8.ir.conversion.IRBuilder$ValueList fromPhis(java.util.List,int):241:243 -> a
     1:9:boolean equals(java.lang.Object):255:263 -> equals
     1:1:int hashCode():250:250 -> hashCode
-com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.lc$f:
+com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem -> com.android.tools.r8.internal.uc$f:
     boolean $assertionsDisabled -> a
     int firstInstructionIndex -> c
     com.android.tools.r8.ir.code.BasicBlock block -> b
@@ -34053,350 +34346,347 @@
     1:1:com.android.tools.r8.ir.code.BasicBlock access$100(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):183:183 -> a
     1:1:int access$400(com.android.tools.r8.ir.conversion.IRBuilder$WorklistItem):183:183 -> b
 com.android.tools.r8.ir.conversion.IRConverter -> com.android.tools.r8.ir.conversion.g:
-    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> F
-    java.util.concurrent.atomic.AtomicBoolean seenNotNeverMergePrefix -> U
-    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> L
-    com.android.tools.r8.ir.optimize.Inliner inliner -> A
-    java.util.List onWaveDoneActions -> S
-    com.android.tools.r8.ir.optimize.Outliner outliner -> d
-    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> H
-    com.android.tools.r8.utils.CfgPrinter printer -> v
-    com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> x
-    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> n
-    com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> g
-    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> l
-    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> o
-    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> w
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> Q
-    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> t
-    com.android.tools.r8.utils.InternalOptions options -> u
-    com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> E
-    com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis fieldAccessAnalysis -> f
-    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> i
-    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> D
-    com.android.tools.r8.graph.DexString highestSortingString -> R
-    java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> V
-    com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> y
-    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> e
-    com.android.tools.r8.ir.optimize.AssumeInserter assumeInserter -> K
-    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> P
-    com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter desugaredLibraryRetargeter -> q
-    java.util.List neverMergePrefixes -> T
-    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> B
-    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> J
-    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> M
-    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> h
-    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> s
-    com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> j
-    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> C
-    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> N
-    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> r
-    com.android.tools.r8.utils.Timing timing -> c
-    com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> p
-    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> k
-    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> O
-    com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> m
+    com.android.tools.r8.ir.desugar.StringConcatRewriter stringConcatRewriter -> i
+    com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter desugaredLibraryRetargeter -> r
+    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> A
+    com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization classInitializerDefaultsOptimization -> f
+    com.android.tools.r8.ir.optimize.Devirtualizer devirtualizer -> D
+    com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer stringBuilderOptimizer -> k
+    com.android.tools.r8.ir.optimize.lambda.LambdaMerger lambdaMerger -> s
+    com.android.tools.r8.ir.optimize.DeadCodeRemover deadCodeRemover -> O
+    com.android.tools.r8.utils.Timing timing -> d
+    com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer idempotentFunctionCallCanonicalizer -> l
+    com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportedMethodRewriter -> q
+    com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring d8NestBasedAccessDesugaring -> n
+    com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer enumValueOptimizer -> J
+    java.util.concurrent.atomic.AtomicBoolean seenNotNeverMergePrefix -> V
+    com.android.tools.r8.ir.optimize.Outliner outliner -> e
+    com.android.tools.r8.ir.optimize.ServiceLoaderRewriter serviceLoaderRewriter -> I
+    com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> o
+    com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> x
+    com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> u
+    com.android.tools.r8.ir.conversion.StringSwitchRemover stringSwitchRemover -> F
+    com.android.tools.r8.ir.analysis.fieldaccess.FieldAccessAnalysis fieldAccessAnalysis -> g
+    com.android.tools.r8.ir.optimize.string.StringOptimizer stringOptimizer -> j
     boolean $assertionsDisabled -> a
-    com.android.tools.r8.ir.conversion.LensCodeRewriter lensCodeRewriter -> z
-    com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer enumValueOptimizer -> I
-    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> G
-    1:1:void <clinit>():122:122 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexTracingResult):190:190 -> <init>
-    2:196:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexTracingResult):172:366 -> <init>
+    com.android.tools.r8.ir.optimize.AssumeInserter assumeInserter -> L
+    java.util.concurrent.atomic.AtomicBoolean seenNeverMergePrefix -> W
+    com.android.tools.r8.graph.DexString highestSortingString -> S
+    com.android.tools.r8.naming.IdentifierNameStringMarker identifierNameStringMarker -> C
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed delayedOptimizationFeedback -> Q
+    com.android.tools.r8.ir.optimize.MemberValuePropagation memberValuePropagation -> z
+    java.util.List neverMergePrefixes -> U
+    com.android.tools.r8.shaking.MainDexTracingResult mainDexClasses -> c
+    com.android.tools.r8.ir.optimize.classinliner.ClassInliner classInliner -> t
+    com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> K
+    com.android.tools.r8.ir.optimize.AssertionsRewriter assertionsRewriter -> N
+    com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer covariantReturnTypeAnnotationTransformer -> E
+    com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector methodOptimizationInfoCollector -> P
+    com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter desugaredLibraryAPIConverter -> H
+    com.android.tools.r8.ir.analysis.TypeChecker typeChecker -> G
+    com.android.tools.r8.graph.AppView appView -> b
+    com.android.tools.r8.ir.optimize.DynamicTypeOptimization dynamicTypeOptimization -> M
+    java.util.List onWaveDoneActions -> T
+    com.android.tools.r8.ir.optimize.Inliner inliner -> B
+    com.android.tools.r8.utils.CfgPrinter printer -> w
+    com.android.tools.r8.ir.optimize.ConstantCanonicalizer constantCanonicalizer -> y
+    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> m
+    com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis libraryMethodOverrideAnalysis -> h
+    com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter twrCloseResourceRewriter -> p
+    com.android.tools.r8.ir.optimize.info.OptimizationFeedback simpleOptimizationFeedback -> R
+    com.android.tools.r8.utils.InternalOptions options -> v
+    1:1:void <clinit>():121:121 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexTracingResult):189:189 -> <init>
+    2:196:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Timing,com.android.tools.r8.utils.CfgPrinter,com.android.tools.r8.shaking.MainDexTracingResult):171:365 -> <init>
     boolean lambda$materializeInstructionBeforeLongOperationsWorkaround$20(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:java.lang.String lambda$new$0(java.lang.String):212:212 -> a
+    1:1:java.lang.String lambda$new$0(java.lang.String):211:211 -> a
     2:382:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageBinaryNameFromJavaType(java.lang.String):0:380 -> a
-    2:382:java.lang.String lambda$new$0(java.lang.String):212 -> a
-    383:383:java.lang.String lambda$new$0(java.lang.String):212:212 -> a
-    384:385:void removeLambdaDeserializationMethods():398:399 -> a
-    384:385:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):479 -> a
-    386:386:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):481:481 -> a
-    387:395:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):480:488 -> a
-    396:397:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):405:406 -> a
-    396:397:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):490 -> a
-    398:400:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):412:414 -> a
-    398:400:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):491 -> a
-    401:401:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):492:492 -> a
-    402:403:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):436:437 -> a
-    402:403:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):492 -> a
-    404:405:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):445:446 -> a
-    404:405:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):493 -> a
-    406:407:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):452:453 -> a
-    406:407:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):494 -> a
-    408:409:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):459:460 -> a
-    408:409:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):495 -> a
-    410:411:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):472:473 -> a
-    410:411:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):497 -> a
-    412:413:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):959:960 -> a
-    412:413:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):498 -> a
-    414:420:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):500:506 -> a
-    421:421:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):503:503 -> a
-    422:424:void lambda$convertMethods$2(boolean,com.android.tools.r8.graph.ProgramMethod):522:524 -> a
-    425:429:void convertMethod(com.android.tools.r8.graph.ProgramMethod):529:533 -> a
-    430:455:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):586:611 -> a
-    430:455:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536 -> a
+    2:382:java.lang.String lambda$new$0(java.lang.String):211 -> a
+    383:383:java.lang.String lambda$new$0(java.lang.String):211:211 -> a
+    384:385:void removeLambdaDeserializationMethods():397:398 -> a
+    384:385:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):478 -> a
+    386:386:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):480:480 -> a
+    387:395:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):479:487 -> a
+    396:397:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):404:405 -> a
+    396:397:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):489 -> a
+    398:400:void synthesizeLambdaClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):411:413 -> a
+    398:400:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):490 -> a
+    401:401:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):491:491 -> a
+    402:403:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):435:436 -> a
+    402:403:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):491 -> a
+    404:405:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):444:445 -> a
+    404:405:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):492 -> a
+    406:407:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):451:452 -> a
+    406:407:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):493 -> a
+    408:409:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):458:459 -> a
+    408:409:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):494 -> a
+    410:411:void processCovariantReturnTypeAnnotations(com.android.tools.r8.graph.DexApplication$Builder):471:472 -> a
+    410:411:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):496 -> a
+    412:413:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):958:959 -> a
+    412:413:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):497 -> a
+    414:420:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):499:505 -> a
+    421:421:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):502:502 -> a
+    422:424:void lambda$convertMethods$2(boolean,com.android.tools.r8.graph.ProgramMethod):521:523 -> a
+    425:429:void convertMethod(com.android.tools.r8.graph.ProgramMethod):528:532 -> a
+    430:455:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):585:610 -> a
+    430:455:void convertMethod(com.android.tools.r8.graph.ProgramMethod):535 -> a
     456:456:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    456:456:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):611 -> a
-    456:456:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536 -> a
+    456:456:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):610 -> a
+    456:456:void convertMethod(com.android.tools.r8.graph.ProgramMethod):535 -> a
     457:457:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
     457:457:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    457:457:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):611 -> a
-    457:457:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536 -> a
-    458:458:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):611:611 -> a
-    458:458:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536 -> a
-    459:459:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537:537 -> a
-    460:460:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):554:554 -> a
-    460:460:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537 -> a
-    461:461:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    461:461:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):557 -> a
-    461:461:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537 -> a
-    462:483:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):561:582 -> a
-    462:483:void convertMethod(com.android.tools.r8.graph.ProgramMethod):537 -> a
-    484:484:void convertMethod(com.android.tools.r8.graph.ProgramMethod):540:540 -> a
-    485:485:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    485:485:void convertMethod(com.android.tools.r8.graph.ProgramMethod):540 -> a
-    486:492:void convertMethod(com.android.tools.r8.graph.ProgramMethod):540:546 -> a
-    493:495:void convertMethod(com.android.tools.r8.graph.ProgramMethod):543:543 -> a
-    500:500:void convertMethod(com.android.tools.r8.graph.ProgramMethod):548:548 -> a
-    501:501:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    501:501:void convertMethod(com.android.tools.r8.graph.ProgramMethod):548 -> a
-    502:506:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1766:1770 -> a
-    502:506:void convertMethod(com.android.tools.r8.graph.ProgramMethod):549 -> a
-    507:512:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):618:623 -> a
-    513:513:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):622:622 -> a
-    514:515:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass):625:626 -> a
-    516:518:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):628:630 -> a
-    519:519:com.android.tools.r8.utils.Timing lambda$optimize$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):681:681 -> a
-    520:521:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):793:794 -> a
-    522:529:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):862:869 -> a
-    530:536:void addWaveDoneAction(com.android.tools.r8.utils.Action):873:879 -> a
-    537:537:void addWaveDoneAction(com.android.tools.r8.utils.Action):877:877 -> a
-    538:538:void addWaveDoneAction(com.android.tools.r8.utils.Action):874:874 -> a
-    539:539:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):887:887 -> a
-    540:540:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):889:889 -> a
-    541:542:void forEachSelectedOutliningMethod(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):899:900 -> a
-    543:545:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):903:905 -> a
+    457:457:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):610 -> a
+    457:457:void convertMethod(com.android.tools.r8.graph.ProgramMethod):535 -> a
+    458:458:void checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):610:610 -> a
+    458:458:void convertMethod(com.android.tools.r8.graph.ProgramMethod):535 -> a
+    459:459:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536:536 -> a
+    460:460:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):553:553 -> a
+    460:460:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536 -> a
+    461:461:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    461:461:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):556 -> a
+    461:461:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536 -> a
+    462:483:boolean needsIRConversion(com.android.tools.r8.graph.Code,com.android.tools.r8.graph.ProgramMethod):560:581 -> a
+    462:483:void convertMethod(com.android.tools.r8.graph.ProgramMethod):536 -> a
+    484:484:void convertMethod(com.android.tools.r8.graph.ProgramMethod):539:539 -> a
+    485:485:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    485:485:void convertMethod(com.android.tools.r8.graph.ProgramMethod):539 -> a
+    486:492:void convertMethod(com.android.tools.r8.graph.ProgramMethod):539:545 -> a
+    493:495:void convertMethod(com.android.tools.r8.graph.ProgramMethod):542:542 -> a
+    500:500:void convertMethod(com.android.tools.r8.graph.ProgramMethod):547:547 -> a
+    501:501:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    501:501:void convertMethod(com.android.tools.r8.graph.ProgramMethod):547 -> a
+    502:506:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1769:1773 -> a
+    502:506:void convertMethod(com.android.tools.r8.graph.ProgramMethod):548 -> a
+    507:512:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):617:622 -> a
+    513:513:void workaroundAbstractMethodOnNonAbstractClassVerificationBug(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):621:621 -> a
+    514:515:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$4(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexProgramClass):624:625 -> a
+    516:518:void lambda$workaroundAbstractMethodOnNonAbstractClassVerificationBug$3(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod):627:629 -> a
+    519:519:com.android.tools.r8.utils.Timing lambda$optimize$5(com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):680:680 -> a
+    520:521:void lambda$optimize$6(com.android.tools.r8.ir.code.IRCode):792:793 -> a
+    522:529:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet):861:868 -> a
+    530:536:void addWaveDoneAction(com.android.tools.r8.utils.Action):872:878 -> a
+    537:537:void addWaveDoneAction(com.android.tools.r8.utils.Action):876:876 -> a
+    538:538:void addWaveDoneAction(com.android.tools.r8.utils.Action):873:873 -> a
+    539:539:void computeReachabilitySensitivity(com.android.tools.r8.graph.DexApplication):886:886 -> a
+    540:540:void lambda$computeReachabilitySensitivity$8(com.android.tools.r8.graph.DexEncodedMethod):888:888 -> a
+    541:542:void forEachSelectedOutliningMethod(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.function.Consumer,java.util.concurrent.ExecutorService):898:899 -> a
+    543:545:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):902:904 -> a
     546:546:boolean com.android.tools.r8.graph.Code.isOutlineCode():0:0 -> a
-    546:546:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):905 -> a
-    547:555:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):905:913 -> a
-    556:556:void clearDexMethodCompilationState():965:965 -> a
-    557:557:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):969:969 -> a
-    558:569:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):982:993 -> a
-    570:570:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1056:1056 -> a
-    570:570:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):993 -> a
-    571:571:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):993:993 -> a
-    572:572:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):992:992 -> a
-    573:574:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):1017:1018 -> a
-    575:579:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):1024:1028 -> a
-    580:580:void lambda$optimizeSynthesizedMethod$11(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1038:1038 -> a
-    581:583:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1045:1047 -> a
-    584:584:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1056:1056 -> a
-    585:587:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1111:1113 -> a
-    585:587:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1103 -> a
-    588:596:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1112:1120 -> a
-    588:596:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1103 -> a
-    597:609:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1116:1128 -> a
-    597:609:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1103 -> a
-    610:628:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1124:1142 -> a
-    610:628:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1103 -> a
-    629:637:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1170:1178 -> a
-    638:643:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1974:1979 -> a
-    638:643:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1181 -> a
-    644:650:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1182:1188 -> a
-    651:651:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1679:1679 -> a
-    651:651:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1188 -> a
-    652:673:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1189:1210 -> a
-    674:710:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1208:1244 -> a
-    711:728:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1243:1260 -> a
-    729:729:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):95:95 -> a
-    729:729:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1260 -> a
-    730:767:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1261:1298 -> a
+    546:546:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):904 -> a
+    547:555:void lambda$forEachSelectedOutliningMethod$10(java.util.function.Consumer,com.android.tools.r8.graph.ProgramMethod):904:912 -> a
+    556:556:void clearDexMethodCompilationState():964:964 -> a
+    557:557:void clearDexMethodCompilationState(com.android.tools.r8.graph.DexProgramClass):968:968 -> a
+    558:569:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):981:992 -> a
+    570:570:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1055:1055 -> a
+    570:570:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):992 -> a
+    571:571:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):992:992 -> a
+    572:572:void replaceCodeForTesting(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):991:991 -> a
+    573:574:void optimizeSynthesizedClass(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):1016:1017 -> a
+    575:579:void optimizeSynthesizedClasses(java.util.Collection,java.util.concurrent.ExecutorService):1023:1027 -> a
+    580:580:void lambda$optimizeSynthesizedMethod$11(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1037:1037 -> a
+    581:583:void processMethodsConcurrently(com.android.tools.r8.utils.collections.SortedProgramMethodSet,java.util.concurrent.ExecutorService):1044:1046 -> a
+    584:584:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1055:1055 -> a
+    585:587:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1110:1112 -> a
+    585:587:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1102 -> a
+    588:596:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1111:1119 -> a
+    588:596:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1102 -> a
+    597:609:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1115:1127 -> a
+    597:609:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1102 -> a
+    610:628:com.android.tools.r8.utils.Timing rewriteCodeInternal(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1123:1141 -> a
+    610:628:com.android.tools.r8.utils.Timing lambda$rewriteCode$13(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1102 -> a
+    629:637:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1169:1177 -> a
+    638:643:void printC1VisualizerHeader(com.android.tools.r8.graph.DexEncodedMethod):1977:1982 -> a
+    638:643:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1180 -> a
+    644:650:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1181:1187 -> a
+    651:651:boolean com.android.tools.r8.utils.InternalOptions.canHaveArtStringNewInitBug():1697:1697 -> a
+    651:651:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1187 -> a
+    652:673:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1188:1209 -> a
+    674:710:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1207:1243 -> a
+    711:728:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1242:1259 -> a
+    729:729:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringsInMethod(com.android.tools.r8.ir.code.IRCode):96:96 -> a
+    729:729:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1259 -> a
+    730:767:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1260:1297 -> a
     768:768:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):888:888 -> a
-    768:768:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1298 -> a
+    768:768:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1297 -> a
     769:769:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):882:882 -> a
-    769:769:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1298 -> a
-    770:860:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1299:1389 -> a
-    861:862:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2414:2415 -> a
-    861:862:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1389 -> a
-    863:873:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1390:1400 -> a
-    874:954:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):0:80 -> a
-    874:954:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1400 -> a
-    955:960:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1401:1406 -> a
-    961:963:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1088:1090 -> a
-    961:963:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1407 -> a
-    964:976:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1411:1423 -> a
-    977:1025:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1422:1470 -> a
-    1026:1122:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1460:1556 -> a
-    1123:1123:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    1123:1123:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1556 -> a
-    1124:1143:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1557:1576 -> a
-    1144:1149:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1118:1123 -> a
-    1144:1149:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1576 -> a
-    1150:1192:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1577:1619 -> a
-    1193:1193:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1687:1687 -> a
-    1193:1193:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1619 -> a
-    1194:1202:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1620:1628 -> a
-    1203:1203:void lambda$optimize$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1287:1287 -> a
-    1204:1204:void lambda$optimize$16(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1291:1291 -> a
-    1205:1207:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1472:1472 -> a
-    1208:1247:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1641:1680 -> a
-    1248:1249:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1694:1695 -> a
-    1250:1250:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    1250:1250:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1695 -> a
-    1251:1256:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1711:1716 -> a
-    1251:1256:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1696 -> a
-    1257:1257:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1698:1698 -> a
-    1258:1265:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1720:1727 -> a
-    1258:1265:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
-    1266:1270:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1766:1770 -> a
-    1266:1270:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1728 -> a
-    1266:1270:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
-    1271:1273:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1729:1731 -> a
-    1271:1273:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
-    1274:1274:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1056:1056 -> a
-    1274:1274:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1731 -> a
-    1274:1274:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
-    1275:1275:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1731:1731 -> a
-    1275:1275:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
-    1276:1282:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1730:1736 -> a
-    1276:1282:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
-    1283:1283:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704:1704 -> a
-    1284:1284:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    1284:1284:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704 -> a
-    1285:1286:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1704:1705 -> a
-    1287:1287:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    1287:1287:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):950 -> a
-    1287:1287:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1705 -> a
-    1288:1289:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):951:952 -> a
-    1288:1289:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1705 -> a
-    1290:1291:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1706:1707 -> a
-    1292:1292:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1741:1741 -> a
-    1293:1302:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1750:1759 -> a
-    1293:1302:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1743 -> a
-    1303:1305:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1744:1746 -> a
-    1306:1313:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1779:1786 -> a
-    1314:1314:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1712:1712 -> a
-    1314:1314:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1786 -> a
-    1315:1315:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1787:1787 -> a
-    1316:5023:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):0:3707 -> a
-    1316:5023:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1787 -> a
-    5024:5024:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
-    5024:5024:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3708 -> a
-    5024:5024:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1787 -> a
-    5025:5026:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3708:3709 -> a
-    5025:5026:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1787 -> a
-    5027:5040:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1789:1802 -> a
-    5041:5041:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1801:1801 -> a
-    5042:5043:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1867:1868 -> a
-    5044:5044:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1866:1866 -> a
-    5045:5045:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1914:1914 -> a
-    5046:5046:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1990:1990 -> a
-    5047:5047:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
-    5047:5047:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1991 -> a
-    5048:5065:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1992:2009 -> a
-    1:7:boolean enableTryWithResourcesDesugaring():388:394 -> b
-    8:17:void convertMethods(com.android.tools.r8.graph.DexProgramClass):510:519 -> b
-    18:18:boolean lambda$convertMethods$1(com.android.tools.r8.graph.DexEncodedMethod):520:520 -> b
-    19:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):642:646 -> b
-    24:25:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):935:936 -> b
-    24:25:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):647 -> b
-    26:27:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):426:427 -> b
-    26:27:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):648 -> b
-    28:52:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):649:673 -> b
-    53:124:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):672:743 -> b
-    125:125:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
-    125:125:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):743 -> b
-    126:126:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):744:744 -> b
-    127:128:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):420:421 -> b
-    127:128:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):746 -> b
-    129:140:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):747:758 -> b
-    141:142:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):436:437 -> b
-    141:142:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):758 -> b
-    143:145:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):759:761 -> b
-    146:147:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):445:446 -> b
-    146:147:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):762 -> b
-    148:149:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):452:453 -> b
-    148:149:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):763 -> b
-    150:151:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):459:460 -> b
-    150:151:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):764 -> b
-    152:153:void synthesizeEnumUnboxingUtilityMethods(java.util.concurrent.ExecutorService):466:467 -> b
-    152:153:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):765 -> b
-    154:154:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):767:767 -> b
-    155:159:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):947:951 -> b
-    155:159:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):769 -> b
+    769:769:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1297 -> a
+    770:780:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1298:1308 -> a
+    781:864:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1307:1390 -> a
+    865:866:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2464:2465 -> a
+    865:866:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1390 -> a
+    867:878:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1391:1402 -> a
+    879:959:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.shouldRun(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):0:80 -> a
+    879:959:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1402 -> a
+    960:965:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1403:1408 -> a
+    966:968:void invertConditionalsForTesting(com.android.tools.r8.ir.code.IRCode):1087:1089 -> a
+    966:968:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1409 -> a
+    969:981:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1413:1425 -> a
+    982:1031:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1424:1473 -> a
+    1032:1129:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1462:1559 -> a
+    1130:1130:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    1130:1130:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1559 -> a
+    1131:1150:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1560:1579 -> a
+    1151:1156:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1124:1129 -> a
+    1151:1156:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1579 -> a
+    1157:1199:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1580:1622 -> a
+    1200:1200:boolean com.android.tools.r8.utils.InternalOptions.canHaveNumberConversionRegisterAllocationBug():1705:1705 -> a
+    1200:1200:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1622 -> a
+    1201:1209:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1623:1631 -> a
+    1210:1210:void lambda$optimize$15(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1286:1286 -> a
+    1211:1211:void lambda$optimize$16(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):1290:1290 -> a
+    1212:1214:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$17(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1475:1475 -> a
+    1215:1254:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):1644:1683 -> a
+    1255:1256:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1697:1698 -> a
+    1257:1257:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    1257:1257:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1698 -> a
+    1258:1263:void finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1714:1719 -> a
+    1258:1263:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1699 -> a
+    1264:1264:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1701:1701 -> a
+    1265:1272:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1723:1730 -> a
+    1265:1272:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1702 -> a
+    1273:1277:void updateHighestSortingStrings(com.android.tools.r8.graph.DexEncodedMethod):1769:1773 -> a
+    1273:1277:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1731 -> a
+    1273:1277:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1702 -> a
+    1278:1280:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1732:1734 -> a
+    1278:1280:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1702 -> a
+    1281:1281:java.lang.String logCode(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexEncodedMethod):1055:1055 -> a
+    1281:1281:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1734 -> a
+    1281:1281:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1702 -> a
+    1282:1282:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1734:1734 -> a
+    1282:1282:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1702 -> a
+    1283:1289:void finalizeToDex(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1733:1739 -> a
+    1283:1289:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1702 -> a
+    1290:1290:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1707:1707 -> a
+    1291:1291:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    1291:1291:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1707 -> a
+    1292:1293:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1707:1708 -> a
+    1294:1294:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    1294:1294:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):963 -> a
+    1294:1294:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1708 -> a
+    1295:1296:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):964:965 -> a
+    1295:1296:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1708 -> a
+    1297:1298:void finalizeEmptyThrowingCode(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1709:1710 -> a
+    1299:1299:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1744:1744 -> a
+    1300:1309:boolean shouldComputeInliningConstraint(com.android.tools.r8.graph.ProgramMethod):1753:1762 -> a
+    1300:1309:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1746 -> a
+    1310:1312:void markProcessed(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):1747:1749 -> a
+    1313:1320:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1782:1789 -> a
+    1321:1321:boolean com.android.tools.r8.utils.InternalOptions.canHaveExceptionTargetingLoopHeaderBug():1730:1730 -> a
+    1321:1321:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1789 -> a
+    1322:1322:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790:1790 -> a
+    1323:5080:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):0:3757 -> a
+    1323:5080:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790 -> a
+    5081:5081:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
+    5081:5081:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3758 -> a
+    5081:5081:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790 -> a
+    5082:5083:void com.android.tools.r8.ir.optimize.CodeRewriter.workaroundExceptionTargetingLoopHeaderBug(com.android.tools.r8.ir.code.IRCode):3758:3759 -> a
+    5082:5083:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1790 -> a
+    5084:5097:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1792:1805 -> a
+    5098:5098:com.android.tools.r8.ir.regalloc.RegisterAllocator performRegisterAllocation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Timing):1804:1804 -> a
+    5099:5100:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1870:1871 -> a
+    5101:5101:com.android.tools.r8.graph.DexMethod lambda$materializeInstructionBeforeLongOperationsWorkaround$19(com.android.tools.r8.graph.DexItemFactory):1869:1869 -> a
+    5102:5102:boolean isNotPseudoInstruction(com.android.tools.r8.ir.code.Instruction):1917:1917 -> a
+    5103:5103:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1993:1993 -> a
+    5104:5104:void com.android.tools.r8.utils.CfgPrinter.resetUnusedValue():24:24 -> a
+    5104:5104:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1994 -> a
+    5105:5122:java.lang.String printMethod(com.android.tools.r8.ir.code.IRCode,java.lang.String,java.lang.String):1995:2012 -> a
+    1:7:boolean enableTryWithResourcesDesugaring():387:393 -> b
+    8:17:void convertMethods(com.android.tools.r8.graph.DexProgramClass):509:518 -> b
+    18:18:boolean lambda$convertMethods$1(com.android.tools.r8.graph.DexEncodedMethod):519:519 -> b
+    19:23:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):641:645 -> b
+    24:25:void collectLambdaMergingCandidates(com.android.tools.r8.graph.DexApplication):934:935 -> b
+    24:25:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):646 -> b
+    26:27:void collectStaticizerCandidates(com.android.tools.r8.graph.DexApplication):425:426 -> b
+    26:27:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):647 -> b
+    28:52:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):648:672 -> b
+    53:124:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):671:742 -> b
+    125:125:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> b
+    125:125:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):742 -> b
+    126:126:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):743:743 -> b
+    127:128:void staticizeClasses(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):419:420 -> b
+    127:128:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):745 -> b
+    129:140:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):746:757 -> b
+    141:142:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):435:436 -> b
+    141:142:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):757 -> b
+    143:145:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):758:760 -> b
+    146:147:void synthesizeTwrCloseResourceUtilityClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):444:445 -> b
+    146:147:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):761 -> b
+    148:149:void processSynthesizedJava8UtilityClasses(java.util.concurrent.ExecutorService):451:452 -> b
+    148:149:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):762 -> b
+    150:151:void synthesizeRetargetClass(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):458:459 -> b
+    150:151:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):763 -> b
+    152:153:void synthesizeEnumUnboxingUtilityMethods(java.util.concurrent.ExecutorService):465:466 -> b
+    152:153:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):764 -> b
+    154:154:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):766:766 -> b
+    155:159:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):946:950 -> b
+    155:159:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):768 -> b
     160:160:com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses com.android.tools.r8.graph.classmerging.HorizontallyMergedLambdaClasses.empty():22:22 -> b
-    160:160:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):951 -> b
-    160:160:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):769 -> b
-    161:163:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):951:953 -> b
-    161:163:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):769 -> b
-    164:164:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):771:771 -> b
-    165:166:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):959:960 -> b
-    165:166:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):772 -> b
-    167:170:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):774:777 -> b
-    171:192:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):776:797 -> b
-    193:200:com.android.tools.r8.graph.DexType computeOutlineClassType():1002:1009 -> b
-    193:200:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):797 -> b
-    201:246:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):797:842 -> b
-    247:250:boolean checkLegacySyntheticsAreInBuilder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication$Builder):850:853 -> b
-    247:250:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):843 -> b
-    251:251:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):844:844 -> b
-    252:255:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):803:806 -> b
-    256:256:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):805:805 -> b
-    257:257:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):858:858 -> b
-    258:258:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):920:920 -> b
-    259:259:void lambda$processMethodsConcurrently$12(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1049:1049 -> b
-    260:269:com.android.tools.r8.utils.Timing processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1075:1084 -> b
-    270:283:boolean desugar(com.android.tools.r8.graph.ProgramMethod):1146:1159 -> b
-    284:288:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1686:1690 -> b
-    289:293:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1830:1834 -> b
-    294:295:void printPhase(java.lang.String):1984:1985 -> b
-    1:1:boolean enableTwrCloseResourceDesugaring():384:384 -> c
-    2:3:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexProgramClass):888:889 -> c
-    4:8:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):927:931 -> c
-    9:9:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):930:930 -> c
-    10:11:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1101:1102 -> c
-    12:12:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1100:1100 -> c
-    13:13:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1859:1859 -> c
-    14:14:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1663:1663 -> c
-    14:14:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1859 -> c
-    15:26:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1862:1873 -> c
+    160:160:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):950 -> b
+    160:160:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):768 -> b
+    161:163:void finalizeLambdaMerging(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.graph.GraphLens):950:952 -> b
+    161:163:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):768 -> b
+    164:164:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):770:770 -> b
+    165:166:void generateDesugaredLibraryAPIWrappers(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService):958:959 -> b
+    165:166:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):771 -> b
+    167:170:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):773:776 -> b
+    171:192:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):775:796 -> b
+    193:200:com.android.tools.r8.graph.DexType computeOutlineClassType():1001:1008 -> b
+    193:200:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):796 -> b
+    201:246:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):796:841 -> b
+    247:250:boolean checkLegacySyntheticsAreInBuilder(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication$Builder):849:852 -> b
+    247:250:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):842 -> b
+    251:251:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):843:843 -> b
+    252:255:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):802:805 -> b
+    256:256:void lambda$optimize$7(com.android.tools.r8.ir.code.IRCode):804:804 -> b
+    257:257:void waveStart(com.android.tools.r8.utils.collections.ProgramMethodSet):857:857 -> b
+    258:258:void processSynthesizedServiceLoaderMethods(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):919:919 -> b
+    259:259:void lambda$processMethodsConcurrently$12(com.android.tools.r8.ir.conversion.OneTimeMethodProcessor,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):1048:1048 -> b
+    260:269:com.android.tools.r8.utils.Timing processMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1074:1083 -> b
+    270:283:boolean desugar(com.android.tools.r8.graph.ProgramMethod):1145:1158 -> b
+    284:288:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1689:1693 -> b
+    289:293:boolean lambda$workaroundForwardingInitializerBug$18(com.android.tools.r8.ir.code.Instruction):1833:1837 -> b
+    294:295:void printPhase(java.lang.String):1987:1988 -> b
+    1:1:boolean enableTwrCloseResourceDesugaring():383:383 -> c
+    2:3:void lambda$computeReachabilitySensitivity$9(com.android.tools.r8.graph.DexProgramClass):887:888 -> c
+    4:8:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):926:930 -> c
+    9:9:void forEachSynthesizedServiceLoaderMethod(com.android.tools.r8.graph.ProgramMethod):929:929 -> c
+    10:11:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1100:1101 -> c
+    12:12:com.android.tools.r8.utils.Timing rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1099:1099 -> c
+    13:13:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1862:1862 -> c
+    14:14:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatLinkedListBug():1681:1681 -> c
+    14:14:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1862 -> c
+    15:26:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1865:1876 -> c
     27:27:boolean com.android.tools.r8.ir.code.Instruction.isMul():0:0 -> c
-    27:27:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1919 -> c
-    27:27:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1874 -> c
-    28:29:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1920:1921 -> c
-    28:29:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1874 -> c
-    30:30:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1877:1877 -> c
-    31:31:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1926:1926 -> c
-    31:31:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1878 -> c
+    27:27:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1922 -> c
+    27:27:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1877 -> c
+    28:29:boolean isLongMul(com.android.tools.r8.ir.code.Instruction):1923:1924 -> c
+    28:29:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1877 -> c
+    30:30:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1880:1880 -> c
+    31:31:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1929:1929 -> c
+    31:31:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1881 -> c
     32:32:boolean com.android.tools.r8.ir.code.Instruction.isSub():0:0 -> c
-    32:32:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1926 -> c
-    32:32:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1878 -> c
-    33:33:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1927:1927 -> c
-    33:33:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1878 -> c
-    34:35:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1931:1932 -> c
-    34:35:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1881 -> c
-    36:37:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1884:1885 -> c
-    38:42:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1905:1909 -> c
-    38:42:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1886 -> c
-    43:48:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1887:1892 -> c
-    49:60:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1941:1952 -> c
-    49:60:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1893 -> c
-    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1032:1036 -> d
-    6:6:java.util.List getOptimizationsForPostIRProcessing():1066:1066 -> d
-    7:7:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1808:1808 -> d
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1700:1700 -> d
-    8:8:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1808 -> d
-    9:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1812:1828 -> d
-    26:29:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1958:1961 -> d
-    26:29:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1839 -> d
-    30:30:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> d
-    30:30:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1961 -> d
-    30:30:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1839 -> d
-    31:39:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1962:1970 -> d
-    31:39:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1839 -> d
-    1:1:boolean isInWave():883:883 -> e
-    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy lambda$desugar$14():1154:1154 -> f
+    32:32:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1929 -> c
+    32:32:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1881 -> c
+    33:33:boolean isLongAddOrSub(com.android.tools.r8.ir.code.Instruction):1930:1930 -> c
+    33:33:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1881 -> c
+    34:35:boolean isFallthoughTarget(com.android.tools.r8.ir.code.BasicBlock):1934:1935 -> c
+    34:35:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1884 -> c
+    36:37:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1887:1888 -> c
+    38:42:boolean isAliasOf(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1908:1912 -> c
+    38:42:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1889 -> c
+    43:48:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1890:1895 -> c
+    49:60:void ensureThrowingInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction):1944:1955 -> c
+    49:60:void materializeInstructionBeforeLongOperationsWorkaround(com.android.tools.r8.ir.code.IRCode):1896 -> c
+    1:5:void optimizeSynthesizedMethod(com.android.tools.r8.graph.ProgramMethod):1031:1035 -> d
+    6:6:java.util.List getOptimizationsForPostIRProcessing():1065:1065 -> d
+    7:7:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1811:1811 -> d
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canHaveForwardingInitInliningBug():1718:1718 -> d
+    8:8:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1811 -> d
+    9:25:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1815:1831 -> d
+    26:38:void ensureInstructionBefore(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):1961:1973 -> d
+    26:38:void workaroundForwardingInitializerBug(com.android.tools.r8.ir.code.IRCode):1842 -> d
+    1:1:boolean isInWave():882:882 -> e
+    1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy lambda$desugar$14():1153:1153 -> f
 com.android.tools.r8.ir.conversion.LensCodeRewriter -> com.android.tools.r8.ir.conversion.i:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer enumUnboxer -> c
@@ -34433,7 +34723,7 @@
     657:657:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):323 -> a
     658:666:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):323:331 -> a
     667:671:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):330:334 -> a
-    672:672:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    672:672:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     672:672:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):336 -> a
     673:673:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):336:336 -> a
     674:704:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod):335:365 -> a
@@ -34476,10 +34766,10 @@
     1949:1951:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):591:593 -> a
     1952:1952:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getHolderType():30:30 -> a
     1952:1952:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):593 -> a
-    1953:1953:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1953:1953:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     1953:1953:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):593 -> a
     1954:1957:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):594:597 -> a
-    1958:1958:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):54:54 -> a
+    1958:1958:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):53:53 -> a
     1958:1958:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):597 -> a
     1959:1964:com.android.tools.r8.graph.DexField rewriteFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.GraphLens):597:602 -> a
     1965:1966:com.android.tools.r8.ir.code.Value rewriteValueIfDefault(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Value):613:614 -> a
@@ -34511,7 +34801,7 @@
     16:16:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):754 -> a
     17:19:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):754:756 -> a
     20:20:void replaceInstructionIfTypeChanged(com.android.tools.r8.graph.DexType,java.util.function.BiFunction):752:752 -> a
-com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.cm:
+com.android.tools.r8.ir.conversion.LensCodeRewriterUtils -> com.android.tools.r8.internal.pm:
     java.util.Map protoFixupCache -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexDefinitionSupplier definitions -> b
@@ -34549,7 +34839,7 @@
     44:90:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):74:120 -> a
     91:91:void com.android.tools.r8.graph.DexMethodHandle.<init>(com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMember,boolean):209:209 -> a
     91:91:com.android.tools.r8.graph.DexMethodHandle rewriteDexMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):120 -> a
-com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.Eo:
+com.android.tools.r8.ir.conversion.MethodOptimizationFeedback -> com.android.tools.r8.internal.Qo:
     void markProcessed(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget) -> a
     void markTriggerClassInitBeforeAnySideEffect(com.android.tools.r8.graph.DexEncodedMethod,boolean) -> a
     void methodInitializesClassesOnNormalExit(com.android.tools.r8.graph.DexEncodedMethod,java.util.Set) -> a
@@ -34577,42 +34867,53 @@
     1:1:void <init>(int,com.android.tools.r8.ir.conversion.MethodProcessingId$1):13:13 -> <init>
     2:2:void <init>(int):18:18 -> <init>
     3:6:void <init>(int):16:19 -> <init>
-    1:4:java.lang.String getId():29:32 -> a
-    1:4:java.lang.String getAndIncrementId():23 -> a
-    5:5:java.lang.String getAndIncrementId():24:24 -> a
-    1:1:int getPrimaryId():36:36 -> b
+    1:2:java.lang.String getId():35:36 -> a
+    1:2:java.lang.String getAndIncrementId():23 -> a
+    3:3:java.lang.String getFullyQualifiedId():42:42 -> a
+    3:3:java.lang.String getId():38 -> a
+    3:3:java.lang.String getAndIncrementId():23 -> a
+    4:4:java.lang.String getAndIncrementId():24:24 -> a
+    1:1:java.lang.String getFullyQualifiedId():42:42 -> b
+    1:1:java.lang.String getFullyQualifiedIdAndIncrement():29 -> b
+    2:2:java.lang.String getFullyQualifiedIdAndIncrement():30:30 -> b
+    1:1:int getPrimaryId():46:46 -> c
 com.android.tools.r8.ir.conversion.MethodProcessingId$1 -> com.android.tools.r8.ir.conversion.j$a:
 com.android.tools.r8.ir.conversion.MethodProcessingId$Factory -> com.android.tools.r8.ir.conversion.j$b:
     java.util.function.BiConsumer consumer -> a
     int nextId -> b
-    1:1:void <init>():45:45 -> <init>
-    2:2:void <init>(java.util.function.BiConsumer):48:48 -> <init>
-    3:10:void <init>(java.util.function.BiConsumer):42:49 -> <init>
-    1:1:java.util.function.BiConsumer access$100(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):39:39 -> a
-    2:3:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds reserveIds(com.android.tools.r8.utils.collections.SortedProgramMethodSet):53:54 -> a
+    1:1:void <init>():55:55 -> <init>
+    2:2:void <init>(java.util.function.BiConsumer):58:58 -> <init>
+    3:10:void <init>(java.util.function.BiConsumer):52:59 -> <init>
+    1:1:java.util.function.BiConsumer access$100(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):49:49 -> a
+    2:3:com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds reserveIds(com.android.tools.r8.utils.collections.SortedProgramMethodSet):63:64 -> a
 com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds -> com.android.tools.r8.ir.conversion.k:
     com.android.tools.r8.ir.conversion.MethodProcessingId$Factory this$0 -> e
     com.android.tools.r8.utils.collections.ProgramMethodSet seen -> d
     boolean $assertionsDisabled -> a
     int firstReservedId -> b
     int numberOfReservedIds -> c
-    1:1:void <clinit>():58:58 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,int,int):66:66 -> <init>
-    2:6:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,int,int):64:68 -> <init>
-    1:6:com.android.tools.r8.ir.conversion.MethodProcessingId get(com.android.tools.r8.graph.ProgramMethod,int):72:77 -> a
+    1:1:void <clinit>():68:68 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,int,int):76:76 -> <init>
+    2:6:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,int,int):74:78 -> <init>
+    1:6:com.android.tools.r8.ir.conversion.MethodProcessingId get(com.android.tools.r8.graph.ProgramMethod,int):82:87 -> a
 com.android.tools.r8.ir.conversion.MethodProcessor -> com.android.tools.r8.ir.conversion.l:
-    boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod) -> a
-    1:1:boolean isPrimary():21:21 -> a
-    boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> b
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():29:29 -> b
-    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():29 -> b
-    com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase() -> c
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet waveExtension -> b
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> a
+    1:10:void <init>():9:18 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation com.android.tools.r8.ir.conversion.CallSiteInformation.empty():29:29 -> a
+    1:1:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():33 -> a
+    2:2:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):37:37 -> a
+    com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase() -> b
+    1:1:void scheduleMethodForProcessingAfterCurrentWave(com.android.tools.r8.graph.ProgramMethod):41:41 -> b
+    boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> c
+    1:1:boolean isPrimary():25:25 -> c
+    1:5:void prepareForWaveExtensionProcessing():45:49 -> d
 com.android.tools.r8.ir.conversion.MethodProcessor$Phase -> com.android.tools.r8.ir.conversion.l$a:
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase POST -> c
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase PRIMARY -> b
     com.android.tools.r8.ir.conversion.MethodProcessor$Phase ONE_TIME -> a
-    1:3:void <clinit>():11:13 -> <clinit>
-    1:1:void <init>(java.lang.String,int):10:10 -> <init>
+    1:3:void <clinit>():12:14 -> <clinit>
+    1:1:void <init>(java.lang.String,int):11:11 -> <init>
 com.android.tools.r8.ir.conversion.NeedsIRDesugarUseRegistry -> com.android.tools.r8.ir.conversion.m:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter interfaceMethodRewriter -> g
     com.android.tools.r8.graph.AppView appView -> d
@@ -34630,47 +34931,45 @@
     1:4:void registerLibraryRetargeting(com.android.tools.r8.graph.DexMethod,boolean):92:95 -> b
     5:7:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):112:114 -> b
     void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField) -> c
-    1:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):101:102 -> c
-    3:4:void registerBackportedMethodRewriting(com.android.tools.r8.graph.DexMethod):71:72 -> c
-    3:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):104 -> c
-    5:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):105:107 -> c
-    1:4:void registerInitClass(com.android.tools.r8.graph.DexType):48:51 -> d
-    5:7:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):133:135 -> d
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> e
+    1:4:void registerInitClass(com.android.tools.r8.graph.DexType):48:51 -> c
+    5:6:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):101:102 -> c
+    7:8:void registerBackportedMethodRewriting(com.android.tools.r8.graph.DexMethod):71:72 -> c
+    7:8:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):104 -> c
+    9:11:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):105:107 -> c
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
+    1:3:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):133:135 -> d
+    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
     void registerStaticFieldRead(com.android.tools.r8.graph.DexField) -> e
     1:2:void registerBackportedMethodRewriting(com.android.tools.r8.graph.DexMethod):71:72 -> e
     1:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):57 -> e
     3:5:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):58:60 -> e
-    void registerNewInstance(com.android.tools.r8.graph.DexType) -> f
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:4:void registerDesugaredLibraryAPIConverter(com.android.tools.r8.graph.DexMethod):84:87 -> f
     void registerStaticFieldWrite(com.android.tools.r8.graph.DexField) -> g
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
     1:3:void registerInterfaceMethodRewriting(com.android.tools.r8.graph.DexMethod):77:79 -> g
-com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.Ir:
-    com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> b
-    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> a
-    1:3:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,com.android.tools.r8.utils.collections.SortedProgramMethodSet):25:27 -> <init>
-    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31:31 -> a
-    2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36:36 -> a
-    2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31 -> a
-    3:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):31:32 -> a
-    3:4:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37 -> a
-    3:4:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31 -> a
-    5:5:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37:37 -> a
-    5:5:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):31 -> a
-    6:6:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36:36 -> a
-    7:8:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):31:32 -> a
-    7:8:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37 -> a
-    9:9:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):37:37 -> a
-    10:10:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.AppView):42:42 -> a
-    11:11:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):48:48 -> a
-    11:11:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.AppView):42 -> a
-    12:12:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):63:63 -> a
-    13:16:void forEachWave(com.android.tools.r8.utils.ThrowingBiConsumer):68:71 -> a
-    17:18:void forEachWave(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):79:80 -> a
-    19:19:void lambda$forEachWave$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):82:82 -> a
-    boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> b
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():58:58 -> c
+com.android.tools.r8.ir.conversion.OneTimeMethodProcessor -> com.android.tools.r8.internal.Ur:
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> c
+    1:3:void <init>(com.android.tools.r8.ir.conversion.MethodProcessingId$Factory,com.android.tools.r8.utils.collections.SortedProgramMethodSet):24:26 -> <init>
+    1:1:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):30:30 -> a
+    2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):35:35 -> a
+    2:2:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):30 -> a
+    3:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):37:38 -> a
+    3:4:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36 -> a
+    3:4:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):30 -> a
+    5:5:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36:36 -> a
+    5:5:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):30 -> a
+    6:6:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):35:35 -> a
+    7:8:com.android.tools.r8.utils.collections.SortedProgramMethodSet com.android.tools.r8.utils.collections.SortedProgramMethodSet.create(com.android.tools.r8.graph.ProgramMethod):37:38 -> a
+    7:8:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36 -> a
+    9:9:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):36:36 -> a
+    10:10:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.AppView):41:41 -> a
+    11:11:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor com.android.tools.r8.ir.conversion.OneTimeMethodProcessor.create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory):47:47 -> a
+    11:11:com.android.tools.r8.ir.conversion.OneTimeMethodProcessor create(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.AppView):41 -> a
+    12:18:void forEachWaveWithExtension(com.android.tools.r8.utils.ThrowingBiConsumer):62:68 -> a
+    19:25:void forEachWaveWithExtension(com.android.tools.r8.utils.ThrowingBiConsumer,java.util.concurrent.ExecutorService):76:82 -> a
+    26:26:void lambda$forEachWaveWithExtension$0(com.android.tools.r8.utils.ThrowingBiConsumer,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):80:80 -> a
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():57:57 -> b
+    boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod) -> c
 com.android.tools.r8.ir.conversion.PartialCallGraphBuilder -> com.android.tools.r8.ir.conversion.n:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.utils.collections.ProgramMethodSet seeds -> g
@@ -34681,77 +34980,75 @@
     3:4:boolean verifyAllMethodsWithCodeExists():35:36 -> a
     1:1:void processMethod(com.android.tools.r8.graph.ProgramMethod):30:30 -> b
 com.android.tools.r8.ir.conversion.PostMethodProcessor -> com.android.tools.r8.ir.conversion.p:
-    java.util.Deque waves -> d
-    java.util.Map methodsMap -> c
-    com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> e
-    com.android.tools.r8.utils.collections.ProgramMethodSet processed -> f
-    boolean $assertionsDisabled -> a
-    1:1:void <clinit>():35:35 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.PostMethodProcessor$1):35:35 -> <init>
-    2:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):46:46 -> <init>
-    3:11:void <init>(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):41:49 -> <init>
-    1:2:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):153:154 -> a
-    3:3:boolean com.android.tools.r8.ir.conversion.CallGraph.isEmpty():278:278 -> a
-    3:3:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):157 -> a
-    4:7:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph):158:161 -> a
-    8:8:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):170:170 -> a
-    9:23:void forEachWave(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):175:189 -> a
-    24:27:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):183:186 -> a
-    28:39:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId):200:211 -> a
-    28:39:void lambda$forEachWave$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):185 -> a
-    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):59:60 -> b
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():54:54 -> c
+    java.util.Collection defaultCodeOptimizations -> e
+    java.util.Deque waves -> g
+    com.android.tools.r8.graph.AppView appView -> d
+    com.android.tools.r8.utils.collections.ProgramMethodSet processed -> h
+    java.util.Map methodsMap -> f
+    boolean $assertionsDisabled -> c
+    1:1:void <clinit>():34:34 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.PostMethodProcessor$1):34:34 -> <init>
+    2:2:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):46:46 -> <init>
+    3:13:void <init>(com.android.tools.r8.graph.AppView,java.util.Collection,java.util.Map,com.android.tools.r8.ir.conversion.CallGraph):40:50 -> <init>
+    1:1:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):155:155 -> a
+    2:2:boolean com.android.tools.r8.ir.conversion.CallGraph.isEmpty():278:278 -> a
+    2:2:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):157 -> a
+    3:6:java.util.Deque createWaves(com.android.tools.r8.ir.conversion.CallGraph):158:161 -> a
+    7:26:void forEachWaveWithExtension(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):175:194 -> a
+    27:31:void lambda$forEachWaveWithExtension$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):185:189 -> a
+    32:43:void forEachMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Collection,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId):205:216 -> a
+    32:43:void lambda$forEachWaveWithExtension$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):188 -> a
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():55:55 -> b
+    2:3:void scheduleMethodForProcessingAfterCurrentWave(com.android.tools.r8.graph.ProgramMethod):169:170 -> b
+    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):60:61 -> c
 com.android.tools.r8.ir.conversion.PostMethodProcessor$1 -> com.android.tools.r8.ir.conversion.o:
 com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder -> com.android.tools.r8.ir.conversion.p$a:
     java.util.Map optimizationsMap -> c
     java.util.Collection defaultCodeOptimizations -> a
     com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder methodsToReprocess -> b
-    1:1:void <init>(java.util.Collection):71:71 -> <init>
-    2:7:void <init>(java.util.Collection):67:72 -> <init>
+    1:1:void <init>(java.util.Collection):72:72 -> <init>
+    2:7:void <init>(java.util.Collection):68:73 -> <init>
     1:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    1:90:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):132 -> a
-    91:94:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):132:135 -> a
-    95:103:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):77:85 -> a
-    104:108:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):84:88 -> a
-    109:109:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexEncodedMethod):87:87 -> a
-    110:110:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):93:93 -> a
-    111:115:void put(com.android.tools.r8.ir.conversion.PostOptimization):98:102 -> a
-    116:125:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):109:118 -> a
-    126:126:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):115:115 -> a
-    127:127:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):114:114 -> a
-    128:133:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124:129 -> a
-    134:134:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):93:93 -> a
-    134:134:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):138 -> a
-    135:143:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):140:148 -> a
-com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.Gs:
+    1:90:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):133 -> a
+    91:94:void lambda$build$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.DexMethod):133:136 -> a
+    95:103:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):78:86 -> a
+    104:108:void put(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.Collection):85:89 -> a
+    109:109:java.util.Collection lambda$put$0(com.android.tools.r8.graph.DexEncodedMethod):88:88 -> a
+    110:110:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):94:94 -> a
+    111:115:void put(com.android.tools.r8.ir.conversion.PostOptimization):99:103 -> a
+    116:125:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):110:119 -> a
+    126:126:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):116:116 -> a
+    127:127:void lambda$rewrittenWithLens$1(java.util.Map,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection):115:115 -> a
+    128:133:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):125:130 -> a
+    134:134:void put(com.android.tools.r8.utils.collections.ProgramMethodSet):94:94 -> a
+    134:134:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):139 -> a
+    135:143:com.android.tools.r8.ir.conversion.PostMethodProcessor build(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):141:149 -> a
+com.android.tools.r8.ir.conversion.PostOptimization -> com.android.tools.r8.internal.Ss:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit() -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
 com.android.tools.r8.ir.conversion.PrimaryMethodProcessor -> com.android.tools.r8.ir.conversion.q:
-    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> c
-    com.android.tools.r8.utils.collections.SortedProgramMethodSet wave -> f
-    com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> b
-    java.util.Deque waves -> e
-    com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> d
-    boolean $assertionsDisabled -> a
+    com.android.tools.r8.ir.conversion.MethodProcessingId$Factory methodProcessingIdFactory -> e
+    com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder postMethodProcessorBuilder -> f
+    java.util.Deque waves -> g
+    com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> d
+    boolean $assertionsDisabled -> c
     1:1:void <clinit>():32:32 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.conversion.CallGraph):48:52 -> <init>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,com.android.tools.r8.ir.conversion.CallGraph):47:51 -> <init>
     1:268:com.android.tools.r8.ir.conversion.CallGraphBuilder com.android.tools.r8.ir.conversion.CallGraph.builder(com.android.tools.r8.graph.AppView):0:267 -> a
-    1:268:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
-    269:270:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61:62 -> a
-    271:292:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):83:104 -> a
-    293:294:void lambda$createWaves$0(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):92:93 -> a
-    295:295:boolean isProcessedConcurrently(com.android.tools.r8.graph.ProgramMethod):110:110 -> a
-    296:297:com.android.tools.r8.utils.Timing lambda$forEachMethod$1(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):137:138 -> a
+    1:268:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60 -> a
+    269:270:com.android.tools.r8.ir.conversion.PrimaryMethodProcessor create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60:61 -> a
+    271:271:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():77:77 -> a
+    272:293:java.util.Deque createWaves(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.ir.conversion.CallSiteInformation):82:103 -> a
+    294:295:void lambda$createWaves$0(com.android.tools.r8.ir.conversion.CallSiteInformation,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.conversion.CallGraph,com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):91:92 -> a
+    296:297:com.android.tools.r8.utils.Timing lambda$forEachMethod$1(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.MethodProcessingId$Factory$ReservedMethodProcessingIds,com.android.tools.r8.graph.ProgramMethod,int):134:135 -> a
     298:299:int com.android.tools.r8.utils.ThreadUtils.getNumberOfThreads(java.util.concurrent.ExecutorService):180:181 -> a
-    298:299:void forEachMethod(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):127 -> a
-    300:318:void forEachMethod(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):127:145 -> a
-    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):72:73 -> b
-    3:3:com.android.tools.r8.ir.conversion.CallSiteInformation getCallSiteInformation():78:78 -> b
-    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():67:67 -> c
+    298:299:void forEachMethod(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):121 -> a
+    300:323:void forEachMethod(com.android.tools.r8.utils.ThrowingBiFunction,com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction,java.util.function.Consumer,com.android.tools.r8.utils.Timing,java.util.concurrent.ExecutorService):121:144 -> a
+    1:1:com.android.tools.r8.ir.conversion.MethodProcessor$Phase getPhase():66:66 -> b
+    1:2:boolean shouldApplyCodeRewritings(com.android.tools.r8.graph.ProgramMethod):71:72 -> c
 com.android.tools.r8.ir.conversion.PrimaryMethodProcessor$WaveStartAction -> com.android.tools.r8.ir.conversion.q$a:
     void notifyWaveStart(com.android.tools.r8.utils.collections.ProgramMethodSet) -> a
-com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.uy:
+com.android.tools.r8.ir.conversion.SourceCode -> com.android.tools.r8.internal.Ny:
     void buildBlockTransfer(com.android.tools.r8.ir.conversion.IRBuilder,int,int,boolean) -> a
     void buildInstruction(com.android.tools.r8.ir.conversion.IRBuilder,int,boolean) -> a
     void buildPrelude(com.android.tools.r8.ir.conversion.IRBuilder) -> a
@@ -34775,11 +35072,9 @@
     com.android.tools.r8.graph.DebugLocalInfo getIncomingLocal(int) -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.qz:
-    1:7:boolean com.android.tools.r8.ir.conversion.StringSwitchConverter.isDefinedByStringHashCode(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):187:193 -> a
-    1:7:boolean access$700(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):107 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.iz:
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.kz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$1 -> com.android.tools.r8.internal.Bz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping -> com.android.tools.r8.internal.Dz:
     com.android.tools.r8.ir.code.Phi idValue -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap mapping -> c
     com.android.tools.r8.ir.code.BasicBlock fallthroughBlock -> a
@@ -34790,7 +35085,7 @@
     2:2:com.android.tools.r8.ir.code.BasicBlock access$002(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):619:619 -> a
     1:1:com.android.tools.r8.ir.code.Phi access$100(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap access$300(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping):619:619 -> c
-com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.jz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder -> com.android.tools.r8.internal.Cz:
     1:1:void <init>():621:621 -> <init>
     1:1:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping build(com.android.tools.r8.ir.code.BasicBlock):648:648 -> a
     2:2:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extend(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):660:660 -> a
@@ -34810,7 +35105,7 @@
     63:77:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):738:752 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping$Builder.setFallthroughBlock(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.BasicBlock):654:654 -> a
     78:78:com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping extendWithSwitch(com.android.tools.r8.ir.conversion.StringSwitchConverter$IdToTargetMapping,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.BasicBlock):741 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.mz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo -> com.android.tools.r8.internal.Fz:
     java.util.Map mapping -> c
     com.android.tools.r8.ir.code.Value value -> d
     com.android.tools.r8.ir.code.BasicBlock insertionBlock -> b
@@ -34819,10 +35114,10 @@
     1:29:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):276:304 -> a
     30:30:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
     30:30:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):304 -> a
-    31:31:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    31:31:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction) -> a
     31:31:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
     31:31:void createAndInsertStringSwitch(com.android.tools.r8.ir.code.IRCode):304 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.lz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo$Builder -> com.android.tools.r8.internal.Ez:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():198:198 -> <clinit>
@@ -34838,7 +35133,7 @@
     20:635:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping.builder(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):0:615 -> a
     20:635:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):221 -> a
     636:660:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringSwitchBuilderInfo build(com.android.tools.r8.ir.code.BasicBlock):223:247 -> a
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.oz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping -> com.android.tools.r8.internal.Hz:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap mapping -> d
     com.android.tools.r8.ir.code.Value stringHashValue -> c
     boolean $assertionsDisabled -> a
@@ -34849,7 +35144,7 @@
     3:7:void <init>(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):603:607 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap access$200(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> a
     1:1:com.android.tools.r8.ir.code.Value access$500(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping):308:308 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.nz:
+com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping$Builder -> com.android.tools.r8.internal.Gz:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.ir.code.Value stringValue -> e
     com.android.tools.r8.ir.code.Phi idValue -> d
@@ -34899,10 +35194,10 @@
     947:997:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):577 -> a
     998:1011:boolean addMappingForString(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexString,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):579:592 -> a
     1:27:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):376:402 -> b
-    28:1534:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:1506 -> b
-    28:1534:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):402 -> b
-    1535:1535:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):403:403 -> b
-com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.pz:
+    28:1536:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.startOfGotoChain():0:1508 -> b
+    28:1536:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):402 -> b
+    1537:1537:com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping extendWithPredecessor(com.android.tools.r8.ir.conversion.StringSwitchConverter$StringToIdMapping,com.android.tools.r8.ir.code.BasicBlock):403:403 -> b
+com.android.tools.r8.ir.conversion.StringSwitchConverter$Utils -> com.android.tools.r8.internal.Iz:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():769:769 -> <clinit>
     1:2:com.android.tools.r8.ir.code.BasicBlock getTrueTarget(com.android.tools.r8.ir.code.If):772:773 -> a
@@ -34940,30 +35235,24 @@
     1:1:void <init>(com.android.tools.r8.ir.conversion.StringSwitchRemover,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set,com.android.tools.r8.ir.conversion.StringSwitchRemover$1):180:180 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.conversion.StringSwitchRemover,com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):192:196 -> <init>
     1:2:java.util.Map createStructure(com.android.tools.r8.ir.code.StringSwitch):200:201 -> a
-    3:20:void removeStringSwitch():208:225 -> a
-    21:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    21:21:void removeStringSwitch():225 -> a
-    22:27:void removeStringSwitch():225:230 -> a
-    28:28:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    28:28:void removeStringSwitch():230 -> a
-    29:37:void removeStringSwitch():230:238 -> a
-    38:38:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    38:38:void removeStringSwitch():240 -> a
-    39:39:void removeStringSwitch():240:240 -> a
-    40:47:void removeStringSwitch():239:246 -> a
-    48:48:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    48:48:void removeStringSwitch():248 -> a
-    49:51:void removeStringSwitch():248:250 -> a
-    52:63:void removeStringSwitch():247:258 -> a
-    64:65:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
-    64:65:void removeStringSwitch():258 -> a
-    66:66:void removeStringSwitch():258:258 -> a
-    67:67:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
-    67:67:void removeStringSwitch():258 -> a
-    68:68:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    68:68:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
-    68:68:void removeStringSwitch():258 -> a
-    69:78:void removeStringSwitch():259:268 -> a
+    3:33:void removeStringSwitch():208:238 -> a
+    34:34:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    34:34:void removeStringSwitch():240 -> a
+    35:35:void removeStringSwitch():240:240 -> a
+    36:43:void removeStringSwitch():239:246 -> a
+    44:44:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    44:44:void removeStringSwitch():248 -> a
+    45:47:void removeStringSwitch():248:250 -> a
+    48:59:void removeStringSwitch():247:258 -> a
+    60:61:void com.android.tools.r8.ir.code.Goto.<init>(com.android.tools.r8.ir.code.BasicBlock):21:22 -> a
+    60:61:void removeStringSwitch():258 -> a
+    62:62:void removeStringSwitch():258:258 -> a
+    63:63:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
+    63:63:void removeStringSwitch():258 -> a
+    64:64:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    64:64:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
+    64:64:void removeStringSwitch():258 -> a
+    65:74:void removeStringSwitch():259:268 -> a
 com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleHashBasedStringSwitchRemover -> com.android.tools.r8.ir.conversion.t:
     com.android.tools.r8.ir.code.BasicBlock hashSwitchFallthroughBlock -> h
     com.android.tools.r8.ir.code.BasicBlock hashSwitchBlock -> g
@@ -34979,37 +35268,29 @@
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap createStructure(com.android.tools.r8.ir.code.StringSwitch):304:305 -> a
     3:9:void lambda$createStructure$0(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.DexString,com.android.tools.r8.ir.code.BasicBlock):307:313 -> a
     10:20:void removeStringSwitch():322:332 -> a
-    21:1168:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):0:1147 -> a
-    21:1168:void removeStringSwitch():332 -> a
-    1169:1177:void removeStringSwitch():333:341 -> a
-    1178:1178:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1178:1178:void removeStringSwitch():341 -> a
-    1179:1182:void removeStringSwitch():341:344 -> a
-    1183:1209:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):409:435 -> a
-    1183:1209:void removeStringSwitch():365 -> a
-    1210:1210:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1210:1210:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):435 -> a
-    1210:1210:void removeStringSwitch():365 -> a
-    1211:1219:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):435:443 -> a
-    1211:1219:void removeStringSwitch():365 -> a
-    1220:1236:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):442:458 -> a
-    1220:1236:void removeStringSwitch():365 -> a
-    1237:1249:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):457:469 -> a
-    1237:1249:void removeStringSwitch():365 -> a
-    1250:1253:void removeStringSwitch():366:369 -> a
-    1254:1262:com.android.tools.r8.ir.code.IntSwitch createHashSwitch(com.android.tools.r8.ir.code.Value):396:404 -> a
-    1254:1262:void removeStringSwitch():369 -> a
-    1263:1279:void removeStringSwitch():370:386 -> a
-    1280:1280:com.android.tools.r8.ir.code.IntSwitch createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):474:474 -> a
-    1280:1280:void removeStringSwitch():389 -> a
-    1281:1283:int[] com.android.tools.r8.utils.ArrayUtils.createIdentityArray(int):112:114 -> a
-    1281:1283:com.android.tools.r8.ir.code.IntSwitch createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):475 -> a
-    1281:1283:void removeStringSwitch():389 -> a
-    1284:1292:com.android.tools.r8.ir.code.IntSwitch createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):476:484 -> a
-    1284:1292:void removeStringSwitch():389 -> a
-    1293:1295:void removeStringSwitch():390:392 -> a
+    21:1165:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):0:1144 -> a
+    21:1165:void removeStringSwitch():332 -> a
+    1166:1177:void removeStringSwitch():333:344 -> a
+    1178:1212:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):409:443 -> a
+    1178:1212:void removeStringSwitch():365 -> a
+    1213:1229:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):442:458 -> a
+    1213:1229:void removeStringSwitch():365 -> a
+    1230:1242:void createHashSwitchTargets(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.ir.code.Value):457:469 -> a
+    1230:1242:void removeStringSwitch():365 -> a
+    1243:1246:void removeStringSwitch():366:369 -> a
+    1247:1255:com.android.tools.r8.ir.code.IntSwitch createHashSwitch(com.android.tools.r8.ir.code.Value):396:404 -> a
+    1247:1255:void removeStringSwitch():369 -> a
+    1256:1272:void removeStringSwitch():370:386 -> a
+    1273:1273:com.android.tools.r8.ir.code.IntSwitch createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):474:474 -> a
+    1273:1273:void removeStringSwitch():389 -> a
+    1274:1276:int[] com.android.tools.r8.utils.ArrayUtils.createIdentityArray(int):112:114 -> a
+    1274:1276:com.android.tools.r8.ir.code.IntSwitch createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):475 -> a
+    1274:1276:void removeStringSwitch():389 -> a
+    1277:1285:com.android.tools.r8.ir.code.IntSwitch createIdSwitch(com.android.tools.r8.ir.code.Phi,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):476:484 -> a
+    1277:1285:void removeStringSwitch():389 -> a
+    1286:1288:void removeStringSwitch():390:392 -> a
     1:1:int getAndIncrementNextBlockNumber():299:299 -> b
-    2:2:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> b
+    2:2:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> b
     2:2:int getAndIncrementNextBlockNumber():299 -> b
 com.android.tools.r8.ir.conversion.StringSwitchRemover$SingleStringSwitchRemover -> com.android.tools.r8.ir.conversion.u:
     java.util.ListIterator blockIterator -> b
@@ -35020,7 +35301,7 @@
     1:1:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set,com.android.tools.r8.ir.conversion.StringSwitchRemover$1):156:156 -> <init>
     2:7:void <init>(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.StringSwitch,java.util.Set):169:174 -> <init>
     void removeStringSwitch() -> a
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.Nz:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver -> com.android.tools.r8.internal.gA:
     java.util.Map unresolvedPayload -> b
     java.util.Map payloadToData -> c
     boolean $assertionsDisabled -> a
@@ -35034,13 +35315,13 @@
     20:20:void clear():84:84 -> a
     1:6:void addPayloadUser(com.android.tools.r8.code.Instruction):35:40 -> b
     7:7:int[] getKeys(int):72:72 -> b
-com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.Mz:
+com.android.tools.r8.ir.conversion.SwitchPayloadResolver$PayloadData -> com.android.tools.r8.internal.fA:
     int[] absoluteTargets -> b
     int[] keys -> c
     int userOffset -> a
     1:1:void <init>(int):26:26 -> <init>
     2:7:void <init>(int):22:27 -> <init>
-com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.DB:
+com.android.tools.r8.ir.conversion.TypeConstraintResolver -> com.android.tools.r8.internal.XB:
     com.android.tools.r8.ir.conversion.IRBuilder builder -> c
     java.util.Map unificationParents -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -35131,14 +35412,14 @@
     73:83:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):115:125 -> a
     84:84:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():87:87 -> a
     84:84:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):126 -> a
-    85:85:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.DexEncodedMethod.getPosition():1386:1386 -> a
+    85:85:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.DexEncodedMethod.getPosition():1399:1399 -> a
     85:85:com.android.tools.r8.position.MethodPosition com.android.tools.r8.graph.ProgramMethod.getPosition():87 -> a
     85:85:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):126 -> a
     86:86:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):126:126 -> a
     87:112:boolean desugar(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.function.Consumer):122:147 -> a
     113:117:void processSynthesizedClasses(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):156:160 -> a
     118:127:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):166:175 -> a
-    128:128:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    128:128:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     128:128:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):175 -> a
     129:143:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):175:189 -> a
     1:1:boolean needsDesugaring(com.android.tools.r8.graph.DexMethod):78:78 -> b
@@ -35212,7 +35493,7 @@
     3:3:com.android.tools.r8.graph.DexProto getProto(com.android.tools.r8.graph.DexItemFactory):1423:1423 -> a
 com.android.tools.r8.ir.desugar.BackportedMethodRewriter$TemplateMethodFactory -> com.android.tools.r8.internal.P1$h:
     com.android.tools.r8.graph.CfCode create(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.internal.N5:
+com.android.tools.r8.ir.desugar.ClassProcessor -> com.android.tools.r8.internal.R5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> f
@@ -35267,7 +35548,7 @@
     124:126:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):535:537 -> a
     124:126:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):517 -> a
     124:126:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):460 -> a
-    127:127:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    127:127:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
     127:127:boolean com.android.tools.r8.ir.desugar.ClassProcessor.isRetargetMethod(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):538 -> a
     127:127:void com.android.tools.r8.ir.desugar.ClassProcessor.resolveForwardForSignature(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,java.util.function.BiConsumer):517 -> a
     127:127:void resolveForwardingMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):460 -> a
@@ -35281,7 +35562,7 @@
     143:168:void lambda$resolveForwardingMethods$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):466 -> a
     169:169:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):586:586 -> a
     169:169:void lambda$resolveForwardingMethods$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):466 -> a
-    170:170:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    170:170:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
     170:170:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):589 -> a
     170:170:void lambda$resolveForwardingMethods$1(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):466 -> a
     171:172:void com.android.tools.r8.ir.desugar.ClassProcessor.addForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):589:590 -> a
@@ -35388,8 +35669,8 @@
     34:36:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.ClassProcessor.computeInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo):357:359 -> b
     34:36:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo com.android.tools.r8.ir.desugar.ClassProcessor.visitInterfaceInfoRaw(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext):696 -> b
     34:36:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo lambda$visitInterfaceInfo$5(com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext,com.android.tools.r8.graph.DexClass):685 -> b
-com.android.tools.r8.ir.desugar.ClassProcessor$1 -> com.android.tools.r8.internal.G5:
-com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.H5:
+com.android.tools.r8.ir.desugar.ClassProcessor$1 -> com.android.tools.r8.internal.K5:
+com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo -> com.android.tools.r8.internal.L5:
     com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> d
     com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo EMPTY -> a
     com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo parent -> b
@@ -35397,7 +35678,7 @@
     1:2:void <clinit>():99:100 -> <clinit>
     1:4:void <init>(com.android.tools.r8.ir.desugar.ClassProcessor$ClassInfo,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):115:118 -> <init>
     1:2:boolean isTargetedByForwards(com.android.tools.r8.graph.DexEncodedMethod):135:136 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.I5:
+com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo -> com.android.tools.r8.internal.M5:
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures signatures -> c
     boolean $assertionsDisabled -> b
     com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo EMPTY -> a
@@ -35410,15 +35691,15 @@
     13:13:boolean com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.isEmpty():84:84 -> a
     13:13:boolean isEmpty():236 -> a
     14:15:boolean isEmpty():236:237 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.J5:
+com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext -> com.android.tools.r8.internal.N5:
     com.android.tools.r8.ir.desugar.ClassProcessor$LibraryReportingContext LIBRARY_CONTEXT -> c
     1:1:void <clinit>():272:272 -> <clinit>
     1:1:void <init>():275:275 -> <init>
     com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass) -> a
     void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter) -> a
-    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1:1:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):285 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.K5:
+com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures -> com.android.tools.r8.internal.O5:
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures EMPTY -> a
     java.util.Set signatures -> b
     1:1:void <clinit>():59:59 -> <clinit>
@@ -35428,14 +35709,14 @@
     2:2:boolean com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures.isEmpty():84:84 -> a
     2:2:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):75 -> a
     3:5:com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures merge(com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures):78:80 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.L5:
+com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext -> com.android.tools.r8.internal.P5:
     com.android.tools.r8.graph.DexClass directSubClass -> a
     com.android.tools.r8.graph.DexProgramClass closestProgramSubClass -> b
     1:3:void <init>(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):247:249 -> <init>
     1:5:com.android.tools.r8.ir.desugar.ClassProcessor$ReportingContext forClass(com.android.tools.r8.graph.DexClass):253:257 -> a
     6:6:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):261:261 -> a
     7:7:void reportMissingType(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):265:265 -> a
-com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.M5:
+com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo -> com.android.tools.r8.internal.Q5:
     com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo emulatedInterfaceInfo -> c
     com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo EMPTY -> a
     com.android.tools.r8.ir.desugar.ClassProcessor$MethodSignatures signatures -> b
@@ -35450,7 +35731,7 @@
     14:14:boolean isEmpty():180 -> a
     15:15:boolean isEmpty():180:180 -> a
     16:20:com.android.tools.r8.ir.desugar.ClassProcessor$SignaturesInfo withEmulatedInterfaceInfo(com.android.tools.r8.ir.desugar.ClassProcessor$EmulatedInterfaceInfo):193:197 -> a
-com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.r7:
+com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer -> com.android.tools.r8.internal.w7:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -35513,7 +35794,7 @@
     172:172:boolean com.android.tools.r8.ir.desugar.CovariantReturnTypeAnnotationTransformer.isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):264:264 -> a
     172:172:boolean isCovariantReturnTypeAnnotation(com.android.tools.r8.graph.DexEncodedAnnotation):260 -> a
     1:1:boolean lambda$updateClass$0(com.android.tools.r8.graph.DexAnnotation):99:99 -> b
-com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.t7:
+com.android.tools.r8.ir.desugar.D8NestBasedAccessDesugaring -> com.android.tools.r8.internal.y7:
     java.util.Map metNestHosts -> i
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():44:44 -> <clinit>
@@ -35524,7 +35805,7 @@
     2:16:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):55:69 -> a
     17:106:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     17:106:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):75 -> a
-    107:107:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    107:107:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     107:107:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     107:107:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):75 -> a
     108:119:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):76:87 -> a
@@ -35534,7 +35815,7 @@
     126:135:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):89:98 -> a
     136:225:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     136:225:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):98 -> a
-    226:226:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    226:226:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     226:226:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     226:226:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):98 -> a
     227:228:void rewriteNestBasedAccesses(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.AppView):99:100 -> a
@@ -35557,19 +35838,19 @@
     252:256:void desugarNestBasedAccess(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):155 -> a
     257:257:void reportIncompleteNest(java.util.List):171:171 -> a
     1:1:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):166:166 -> c
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.internal.T7:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper -> com.android.tools.r8.internal.Y7:
     java.util.Set candidates -> a
     java.util.Set hidden -> b
     1:5:void <init>():17:21 -> <init>
     1:2:void merge(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):60:61 -> a
     3:5:void hideMatches(com.android.tools.r8.graph.DexMethod):65:67 -> a
-    6:218:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:212 -> a
-    6:218:void hideMatches(com.android.tools.r8.graph.DexMethod):68 -> a
-    219:220:void hideMatches(com.android.tools.r8.graph.DexMethod):69:70 -> a
-    221:221:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
-    222:224:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():81:83 -> a
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.S7:
-com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.T7$a:
+    6:222:boolean com.android.tools.r8.graph.DexMethod.match(com.android.tools.r8.graph.DexEncodedMethod):0:216 -> a
+    6:222:void hideMatches(com.android.tools.r8.graph.DexMethod):68 -> a
+    223:224:void hideMatches(com.android.tools.r8.graph.DexMethod):69:70 -> a
+    225:225:void addDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):76:76 -> a
+    226:228:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection wrapInCollection():81:83 -> a
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$1 -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection -> com.android.tools.r8.internal.Y7$a:
     java.util.List live -> b
     com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection EMPTY -> a
     java.util.List hidden -> c
@@ -35579,7 +35860,7 @@
     1:1:java.util.List access$000(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):28:28 -> a
     2:4:com.android.tools.r8.graph.DexMethod getSingleCandidate(com.android.tools.r8.graph.DexMethod):46:48 -> a
     1:1:java.util.List access$100(com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection):28:28 -> b
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.g8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter -> com.android.tools.r8.internal.l8:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     java.util.Set trackedCallBackAPIs -> i
     com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer wrapperSynthesizor -> f
@@ -35650,7 +35931,7 @@
     141:141:java.util.List lambda$addCallBackSignature$1(com.android.tools.r8.graph.DexProgramClass):268:268 -> a
     142:156:com.android.tools.r8.graph.DexMethod methodWithVivifiedTypeInSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):280:294 -> a
     157:162:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):302:307 -> a
-    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    163:163:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     163:163:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):307 -> a
     164:164:void finalizeWrappers(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):308:308 -> a
     165:172:void lambda$generateCallbackMethods$3(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,java.util.List):322:329 -> a
@@ -35660,7 +35941,7 @@
     187:188:void lambda$generateCallbackMethods$2(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexEncodedMethod):326:327 -> a
     189:195:void generateTrackDesugaredAPIWarnings(java.util.Set,java.lang.String):359:365 -> a
     196:208:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):369:381 -> a
-    209:209:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    209:209:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     209:209:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):381 -> a
     210:210:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):384:384 -> a
     211:211:void reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.lang.String):382:382 -> a
@@ -35673,19 +35954,19 @@
     265:265:com.android.tools.r8.graph.DexMethod createConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):589:589 -> a
     266:267:boolean canConvert(com.android.tools.r8.graph.DexType):599:600 -> a
     1:5:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):150:154 -> b
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     6:6:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):154 -> b
     7:7:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     7:7:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):155 -> b
     8:8:boolean shouldRewriteInvoke(com.android.tools.r8.graph.DexMethod):158:158 -> b
     9:19:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):198:208 -> b
-    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    20:20:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     20:20:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):208 -> b
     21:23:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):212:214 -> b
     24:24:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
     24:24:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
     25:25:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216:216 -> b
-    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> b
+    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> b
     26:26:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):216 -> b
     27:33:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):235:241 -> b
     27:33:boolean overridesLibraryMethod(com.android.tools.r8.graph.ProgramMethod):219 -> b
@@ -35694,24 +35975,24 @@
     1:1:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):162:162 -> c
     2:6:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):250:254 -> c
     2:6:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> c
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> c
     7:7:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):254 -> c
     7:7:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
     8:11:void com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.registerCallback(com.android.tools.r8.graph.ProgramMethod):258:261 -> c
     8:11:void registerCallbackIfRequired(com.android.tools.r8.graph.ProgramMethod):163 -> c
     1:7:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):175:181 -> d
-    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> d
+    8:8:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():393:393 -> d
     8:8:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181 -> d
     9:18:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):181:190 -> d
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> d
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> d
     19:19:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):190 -> d
     20:20:boolean shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):193:193 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.internal.g8$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode -> com.android.tools.r8.internal.l8$a:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode GENERATE_CALLBACKS_AND_WRAPPERS -> a
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter$Mode ASSERT_CALLBACKS_AND_WRAPPERS_GENERATED -> b
     1:2:void <clinit>():82:83 -> <clinit>
     1:1:void <init>(java.lang.String,int):81:81 -> <init>
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.h8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration -> com.android.tools.r8.internal.m8:
     java.lang.String jsonSource -> f
     com.android.tools.r8.utils.AndroidApiLevel requiredCompilationAPILevel -> b
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration EMPTY_DESUGARED_LIBRARY_CONFIGURATION -> a
@@ -35751,8 +36032,8 @@
     1:1:java.lang.String getSynthesizedLibraryClassesPackagePrefix():149:149 -> l
     1:1:java.util.Set getWrapperConversions():190:190 -> m
     1:1:boolean isLibraryCompilation():145:145 -> n
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.h8$a:
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.h8$b:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$1 -> com.android.tools.r8.internal.m8$a:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder -> com.android.tools.r8.internal.m8$b:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.lang.String synthesizedLibraryClassesPackagePrefix -> g
     java.util.List extraKeepRules -> q
@@ -35822,7 +36103,7 @@
     5:5:int sharpIndex(java.lang.String,java.lang.String):358 -> f
     6:6:int sharpIndex(java.lang.String,java.lang.String):358:358 -> f
     7:7:com.android.tools.r8.graph.DexType stringClassToDexType(java.lang.String):365:365 -> f
-com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.i8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser -> com.android.tools.r8.internal.n8:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration$Builder configurationBuilder -> g
     com.android.tools.r8.utils.Reporter reporter -> d
@@ -35859,7 +36140,7 @@
     203:217:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
     218:230:void com.android.tools.r8.ir.desugar.DesugaredLibraryConfigurationParser.parseFlags(com.android.tools.r8.com.google.gson.JsonObject):210:222 -> a
     218:230:void parseFlagsList(com.android.tools.r8.com.google.gson.JsonArray):174 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.o8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter -> com.android.tools.r8.internal.t8:
     java.util.Map retargetLibraryMember -> c
     java.util.Map nonFinalHolderRewrites -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -35872,7 +36153,7 @@
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):62:62 -> a
     2:17:void amendLibraryWithRetargetedMembers(com.android.tools.r8.graph.AppView):99:114 -> a
     18:21:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):120:123 -> a
-    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    22:22:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     22:22:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):124 -> a
     23:23:java.util.Map synthesizeLibraryClassesForRetargetedMembers(com.android.tools.r8.graph.AppView,java.util.Map):125:125 -> a
     24:33:com.android.tools.r8.graph.DexLibraryClass lambda$synthesizeLibraryClassesForRetargetedMembers$1(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):131:140 -> a
@@ -35891,35 +36172,35 @@
     81:84:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView):247:250 -> a
     85:85:long lambda$getChecksumSupplier$6(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass):250:250 -> a
     86:86:void visit(java.util.function.Consumer):255:255 -> a
-    87:87:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    87:87:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):168 -> a
-    88:94:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:175 -> a
-    95:95:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):270:270 -> a
-    95:95:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
-    96:96:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> a
-    97:99:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):265:265 -> a
-    97:99:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):177 -> a
-    100:112:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):179:191 -> a
-    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
-    113:113:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191 -> a
-    114:114:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):184:184 -> a
-    115:115:void desugar(com.android.tools.r8.ir.code.IRCode):259:259 -> a
-    116:116:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
-    116:116:void desugar(com.android.tools.r8.ir.code.IRCode):263 -> a
-    117:127:void desugar(com.android.tools.r8.ir.code.IRCode):264:274 -> a
-    128:128:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    128:128:void desugar(com.android.tools.r8.ir.code.IRCode):281 -> a
-    129:133:void desugar(com.android.tools.r8.ir.code.IRCode):281:285 -> a
-    134:595:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
-    134:595:void desugar(com.android.tools.r8.ir.code.IRCode):285 -> a
-    596:596:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
-    596:596:void desugar(com.android.tools.r8.ir.code.IRCode):287 -> a
-    597:604:void desugar(com.android.tools.r8.ir.code.IRCode):288:295 -> a
-    605:605:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    605:605:void desugar(com.android.tools.r8.ir.code.IRCode):294 -> a
-    606:607:void desugar(com.android.tools.r8.ir.code.IRCode):301:302 -> a
-    608:608:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    608:608:void desugar(com.android.tools.r8.ir.code.IRCode):301 -> a
+    87:87:void desugar(com.android.tools.r8.ir.code.IRCode):259:259 -> a
+    88:88:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
+    88:88:void desugar(com.android.tools.r8.ir.code.IRCode):263 -> a
+    89:99:void desugar(com.android.tools.r8.ir.code.IRCode):264:274 -> a
+    100:100:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    100:100:void desugar(com.android.tools.r8.ir.code.IRCode):281 -> a
+    101:105:void desugar(com.android.tools.r8.ir.code.IRCode):281:285 -> a
+    106:567:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
+    106:567:void desugar(com.android.tools.r8.ir.code.IRCode):285 -> a
+    568:568:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
+    568:568:void desugar(com.android.tools.r8.ir.code.IRCode):287 -> a
+    569:576:void desugar(com.android.tools.r8.ir.code.IRCode):288:295 -> a
+    577:577:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    577:577:void desugar(com.android.tools.r8.ir.code.IRCode):294 -> a
+    578:579:void desugar(com.android.tools.r8.ir.code.IRCode):301:302 -> a
+    580:580:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    580:580:void desugar(com.android.tools.r8.ir.code.IRCode):301 -> a
+    581:581:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    581:581:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):168 -> a
+    582:588:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169:175 -> a
+    589:589:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withHolder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):274:274 -> a
+    589:589:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):175 -> a
+    590:590:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):176:176 -> a
+    591:593:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexMethod.withExtraArgumentPrepended(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):269:269 -> a
+    591:593:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):177 -> a
+    594:606:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):179:191 -> a
+    607:607:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
+    607:607:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):191 -> a
+    608:608:void lambda$synthesizedMembersForRetargetClasses$5(com.android.tools.r8.graph.AppView,java.util.Map,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):184:184 -> a
     609:616:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):307:314 -> a
     617:1126:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):0:509 -> a
     617:1126:com.android.tools.r8.graph.DexMethod getRetargetedMethod(com.android.tools.r8.graph.DexMethod,boolean):314 -> a
@@ -35928,7 +36209,7 @@
     1140:1140:void synthesizeRetargetClasses(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):421:421 -> a
     1141:1141:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):616:616 -> a
     1141:1141:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1142:1142:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    1142:1142:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     1142:1142:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):616 -> a
     1142:1142:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
     1143:1143:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
@@ -35936,7 +36217,7 @@
     1143:1143:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
     1144:1147:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):624:627 -> a
     1144:1147:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
-    1148:1148:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    1148:1148:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
     1148:1148:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):629 -> a
     1148:1148:void access$800(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexLibraryClass,java.util.Set):62 -> a
     1149:1149:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.reportInvalidLibrarySupertype(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):629:629 -> a
@@ -35950,7 +36231,7 @@
     1153:1167:com.android.tools.r8.graph.DexType dispatchTypeFor(com.android.tools.r8.graph.DexEncodedMethod,java.lang.String):645:659 -> a
     1:1:java.util.Map access$300(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):62:62 -> b
     2:4:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):86:88 -> b
-    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     5:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):89 -> b
     6:11:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter.warnMissingRetargetCoreLibraryMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):201:206 -> b
     6:11:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppView):91 -> b
@@ -35959,18 +36240,18 @@
     18:18:com.android.tools.r8.graph.DexType access$700(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.graph.DexEncodedMethod):62 -> b
     1:1:java.util.Map access$500(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):62:62 -> c
     1:1:java.util.Set access$600(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):62:62 -> d
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.l8:
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.m8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1 -> com.android.tools.r8.internal.q8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer -> com.android.tools.r8.internal.r8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():427:427 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter):427:427 -> <init>
     1:1:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):432:432 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     2:2:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):432 -> a
     3:3:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):523:523 -> a
     3:3:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     4:4:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):523 -> a
     4:4:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
     5:19:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.synthesizeEmulatedDispatchMethods(com.android.tools.r8.graph.DexApplication$Builder):523:537 -> a
@@ -35999,13 +36280,13 @@
     75:82:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):433 -> a
     83:83:void fixApp(com.android.tools.r8.graph.DexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):435:435 -> a
     84:84:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441:441 -> a
-    85:85:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    85:85:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     85:85:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441 -> a
     86:86:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):441:441 -> a
     87:87:java.util.IdentityHashMap com.android.tools.r8.com.google.common.collect.Maps.newIdentityHashMap():511:511 -> a
     87:87:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):442 -> a
     88:98:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):443:453 -> a
-    99:99:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    99:99:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     99:99:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):453 -> a
     100:100:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     100:100:void addInterfacesAndForwardingMethods(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.conversion.IRConverter):457 -> a
@@ -36013,7 +36294,7 @@
     113:113:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):461:461 -> a
     114:118:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):474:478 -> a
     114:118:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):461 -> a
-    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    119:119:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     119:119:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.inherit(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexType,java.util.Set):478 -> a
     119:119:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):461 -> a
     120:120:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
@@ -36037,7 +36318,7 @@
     140:141:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$EmulatedDispatchTreeFixer.addInterfacesAndForwardingMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,java.util.function.Consumer):504:505 -> a
     140:141:void lambda$addInterfacesAndForwardingMethods$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):462 -> a
     142:142:void lambda$addInterfacesAndForwardingMethods$0(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):463:463 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.n8:
+com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup -> com.android.tools.r8.internal.s8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter this$0 -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():351:351 -> <clinit>
@@ -36045,7 +36326,7 @@
     2:2:void <init>(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter,com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$1):351:351 -> <init>
     1:5:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():354:358 -> a
     1:5:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     6:6:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():358 -> a
     6:6:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
     7:7:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():360:360 -> a
@@ -36055,39 +36336,39 @@
     8:14:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
     15:20:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():362:367 -> a
     15:20:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    21:1123:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):0:1102 -> a
-    21:1123:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
-    21:1123:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1124:1124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1124:1124:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1103 -> a
-    1124:1124:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
-    1124:1124:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1125:1134:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1104:1113 -> a
-    1125:1134:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
-    1125:1134:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1135:1135:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
-    1135:1135:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():370 -> a
-    1135:1135:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1136:1136:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373:373 -> a
-    1136:1136:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1137:1138:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):407:408 -> a
-    1137:1138:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
-    1137:1138:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1139:1139:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    1139:1139:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):408 -> a
-    1139:1139:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
-    1139:1139:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1140:1143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):410:413 -> a
-    1140:1143:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
-    1140:1143:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1144:1151:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():374:381 -> a
-    1144:1151:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1152:1154:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):389:391 -> a
-    1152:1154:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():381 -> a
-    1152:1154:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-    1155:1155:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():380:380 -> a
+    21:1139:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):0:1118 -> a
+    21:1139:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
+    21:1139:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1140:1140:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1140:1140:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1119 -> a
+    1140:1140:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
+    1140:1140:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1141:1150:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterfaceDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):1120:1129 -> a
+    1141:1150:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():367 -> a
+    1141:1150:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1151:1151:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
+    1151:1151:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():370 -> a
+    1151:1151:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1152:1152:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373:373 -> a
+    1152:1152:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1153:1154:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):407:408 -> a
+    1153:1154:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
+    1153:1154:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1155:1155:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    1155:1155:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):408 -> a
+    1155:1155:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
     1155:1155:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
-com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.p8:
+    1156:1159:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.handleEmulateDispatch(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexEncodedMethod):410:413 -> a
+    1156:1159:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():373 -> a
+    1156:1159:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1160:1167:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():374:381 -> a
+    1160:1167:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1168:1170:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.computeRetargetMethod(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexType):389:391 -> a
+    1168:1170:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():381 -> a
+    1168:1170:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+    1171:1171:void com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup.setUpRetargeting():380:380 -> a
+    1171:1171:void access$100(com.android.tools.r8.ir.desugar.DesugaredLibraryRetargeter$RetargetingSetup):351 -> a
+com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer -> com.android.tools.r8.internal.u8:
     java.util.Set invalidWrappers -> g
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexString dexWrapperPrefixDexString -> d
@@ -36109,7 +36390,7 @@
     7:9:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.createWrapperType(com.android.tools.r8.graph.DexType,java.lang.String):154:154 -> a
     7:9:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):164 -> a
     10:10:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):165:165 -> a
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     11:11:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):166 -> a
     12:12:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
     12:12:com.android.tools.r8.graph.DexType lambda$getWrapper$0(com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.graph.DexType):166 -> a
@@ -36138,13 +36419,13 @@
     87:87:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
     87:87:com.android.tools.r8.graph.DexEncodedMethod newSynthesizedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.Code):380 -> a
     88:110:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):386:408 -> a
-    111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    111:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     111:111:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):408 -> a
     112:112:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):410:410 -> a
-    113:113:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    113:113:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     113:113:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):410 -> a
     114:120:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):410:416 -> a
-    121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    121:121:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     121:121:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):416 -> a
     122:123:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):417:418 -> a
     124:124:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):425:425 -> a
@@ -36169,14 +36450,14 @@
     172:186:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):300:314 -> a
     172:186:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     172:186:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
-    187:187:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    187:187:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     187:187:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):314 -> a
     187:187:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     187:187:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
     188:188:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):315:315 -> a
     188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     188:188:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
-    189:189:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    189:189:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     189:189:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):315 -> a
     189:189:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     189:189:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
@@ -36186,7 +36467,7 @@
     195:195:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):318:318 -> a
     195:195:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     195:195:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
-    196:196:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    196:196:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
     196:196:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):321 -> a
     196:196:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):193 -> a
     196:196:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):512 -> a
@@ -36227,7 +36508,7 @@
     234:247:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):248:261 -> a
     234:247:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
     234:247:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):520 -> a
-    248:248:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    248:248:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     248:248:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):261 -> a
     248:248:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
     248:248:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):520 -> a
@@ -36240,7 +36521,7 @@
     266:266:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):274:274 -> a
     266:266:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
     266:266:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):520 -> a
-    267:267:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
+    267:267:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
     267:267:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.synthesizeVirtualMethodsForVivifiedTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):277 -> a
     267:267:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.DesugaredLibraryWrapperSynthesizer.generateVivifiedTypeWrapper(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):207 -> a
     267:267:void generateWrappers(com.android.tools.r8.graph.ClassKind,java.util.Set,java.util.function.BiConsumer):520 -> a
@@ -36278,22 +36559,21 @@
     1:2:com.android.tools.r8.graph.DexType getTypeWrapper(com.android.tools.r8.graph.DexType):143:144 -> b
     3:3:com.android.tools.r8.graph.DexField wrappedValueField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):425:425 -> b
     1:1:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):173:173 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
     2:2:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):173 -> c
     3:3:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):175:175 -> c
     4:4:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
     4:4:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176 -> c
     5:5:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176:176 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> c
     6:6:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176 -> c
     7:8:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):176:177 -> c
     1:2:com.android.tools.r8.graph.DexType getVivifiedTypeWrapper(com.android.tools.r8.graph.DexType):149:150 -> d
     1:1:boolean hasSynthesized(com.android.tools.r8.graph.DexType):134:134 -> e
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.internal.Xf:
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter -> com.android.tools.r8.internal.kg:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     java.util.Set emulatedMethods -> h
     com.android.tools.r8.utils.collections.SortedProgramMethodSet synthesizedMethods -> i
-    java.util.concurrent.ConcurrentMap requiredDispatchClasses -> k
     com.android.tools.r8.graph.DexItemFactory factory -> f
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.utils.InternalOptions options -> e
@@ -36302,386 +36582,389 @@
     int $r8$clinit -> b
     java.util.Map emulatedInterfaces -> g
     1:1:void <clinit>():99:99 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):141:141 -> <init>
-    2:36:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):114:148 -> <init>
-    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):152:156 -> a
-    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):156:156 -> a
-    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):160:160 -> a
-    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):161:162 -> a
-    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):167:168 -> a
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):137:137 -> <init>
+    2:32:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):114:144 -> <init>
+    1:5:void checkForAssumedLibraryTypes(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.utils.InternalOptions):148:152 -> a
+    6:6:void lambda$checkForAssumedLibraryTypes$0(java.util.function.BiConsumer,com.android.tools.r8.graph.DexString,java.util.Map):152:152 -> a
+    7:7:java.util.function.BiConsumer registerMapEntry(com.android.tools.r8.graph.AppInfo):156:156 -> a
+    8:9:void lambda$registerMapEntry$1(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):157:158 -> a
+    10:11:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):163:164 -> a
     12:12:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):169 -> a
-    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):169:170 -> a
-    15:18:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):172:175 -> a
-    19:23:void initializeEmulatedInterfaceVariables():183:187 -> a
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    24:24:void initializeEmulatedInterfaceVariables():187 -> a
-    25:26:void initializeEmulatedInterfaceVariables():190:191 -> a
-    27:27:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:198 -> a
-    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199 -> a
-    29:31:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):199:201 -> a
-    32:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):200:200 -> a
-    33:40:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:205 -> a
-    41:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):204:204 -> a
-    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):202:202 -> a
-    43:53:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):224:234 -> a
-    54:54:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
-    54:54:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):236 -> a
-    55:57:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):239:241 -> a
-    58:58:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
-    58:58:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):242 -> a
-    59:61:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):243:243 -> a
-    68:81:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):250:263 -> a
-    82:82:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    82:82:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514 -> a
-    82:82:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264 -> a
-    83:83:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514:514 -> a
-    83:83:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):264 -> a
-    84:90:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):275:281 -> a
-    91:91:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
-    91:91:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):283 -> a
-    92:93:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):284:285 -> a
-    94:104:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):281:291 -> a
-    105:105:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    105:105:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    106:106:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    106:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> a
-    106:106:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    107:107:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> a
-    107:107:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):292 -> a
-    108:108:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):293:293 -> a
-    109:109:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):291:291 -> a
-    110:110:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
-    110:110:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):299 -> a
-    111:119:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):300:308 -> a
-    120:120:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    120:120:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):308 -> a
-    121:121:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):319:319 -> a
-    122:123:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):853:854 -> a
-    122:123:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):319 -> a
-    124:124:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):320:320 -> a
-    125:125:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    125:125:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):321 -> a
-    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    126:126:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    126:126:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):321 -> a
-    127:127:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):322:322 -> a
-    128:137:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):320:329 -> a
-    138:599:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
-    138:599:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):329 -> a
-    600:601:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):330:331 -> a
-    602:602:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    602:602:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):331 -> a
-    603:603:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    603:603:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):332 -> a
-    604:605:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):332:333 -> a
-    606:606:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    606:606:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):335 -> a
-    607:608:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):336:337 -> a
-    609:625:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):333:349 -> a
-    626:1087:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
-    626:1087:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):349 -> a
-    1088:1088:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351:351 -> a
-    1089:1089:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1089:1089:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):351 -> a
-    1090:1090:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1090:1090:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):352 -> a
-    1091:1098:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):356:363 -> a
-    1099:1099:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    1099:1099:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365 -> a
-    1100:1101:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365:366 -> a
-    1102:1109:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364:371 -> a
-    1110:1116:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):369:375 -> a
-    1117:1131:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):373:387 -> a
-    1132:1221:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    1132:1221:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):391 -> a
-    1222:1223:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):394:395 -> a
-    1224:1224:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1224:1224:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):396 -> a
-    1225:1231:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):401:407 -> a
-    1232:1232:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> a
-    1232:1232:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):409 -> a
-    1233:1233:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> a
-    1233:1233:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> a
-    1233:1233:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):409 -> a
-    1234:1235:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):410:411 -> a
-    1236:1242:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):407:413 -> a
-    1243:1243:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    1243:1243:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    1244:1244:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    1244:1244:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    1244:1244:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):415 -> a
-    1245:1246:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):416:417 -> a
-    1247:1263:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):413:429 -> a
-    1264:1272:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):425:433 -> a
-    1273:1275:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):397:399 -> a
-    1276:1276:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    1276:1276:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    1276:1276:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):399 -> a
-    1277:1317:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):399:439 -> a
-    1318:1318:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
-    1318:1318:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):439 -> a
-    1319:1331:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):440:452 -> a
-    1332:1332:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1332:1332:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):452 -> a
-    1333:1334:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):452:453 -> a
-    1335:1335:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    1335:1335:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):453 -> a
-    1336:1336:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502:502 -> a
-    1336:1336:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1337:1337:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1337:1337:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502 -> a
-    1337:1337:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1338:1341:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):502:505 -> a
-    1338:1341:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1342:1344:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):624:626 -> a
-    1342:1344:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):507 -> a
-    1342:1344:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1345:1345:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):623:623 -> a
-    1345:1345:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):507 -> a
-    1345:1345:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1346:1347:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):508:509 -> a
-    1346:1347:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1348:1348:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):505:505 -> a
-    1348:1348:void rewriteMethodReferences(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):454 -> a
-    1349:1349:java.util.Set lambda$rewriteMethodReferences$3(com.android.tools.r8.graph.DexLibraryClass):287:287 -> a
-    1350:1350:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:518 -> a
-    1351:1351:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1351:1351:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518 -> a
-    1352:1352:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:518 -> a
-    1353:1353:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    1353:1353:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518 -> a
-    1354:1358:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):518:522 -> a
-    1359:1364:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):582:587 -> a
-    1365:1365:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1365:1365:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):587 -> a
-    1366:1375:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):589:598 -> a
-    1376:1376:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1376:1376:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):598 -> a
-    1377:1377:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):600:600 -> a
-    1378:1383:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):631:636 -> a
-    1384:1390:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):635:641 -> a
-    1391:1391:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    1391:1391:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643 -> a
-    1392:1392:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):643:643 -> a
-    1393:1411:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):642:660 -> a
-    1412:1412:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1412:1412:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):660 -> a
-    1413:1413:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661:661 -> a
-    1414:1420:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):607:613 -> a
-    1414:1420:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
-    1421:1421:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1421:1421:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):613 -> a
-    1421:1421:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
-    1422:1422:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):615:615 -> a
-    1422:1422:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):661 -> a
-    1423:1428:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):662:667 -> a
-    1429:1429:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):665:665 -> a
-    1430:1444:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):662:676 -> a
-    1445:1445:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1445:1445:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):676 -> a
-    1446:1450:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):677:681 -> a
-    1451:1451:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    1451:1451:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685 -> a
-    1452:1453:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685:686 -> a
-    1454:1454:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):684:684 -> a
-    1455:1469:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681:695 -> a
-    1470:1472:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):624:626 -> a
-    1470:1472:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    1473:1473:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):623:623 -> a
-    1473:1473:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695 -> a
-    1474:1474:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):695:695 -> a
-    1475:1475:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):693:693 -> a
-    1476:1521:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):692:737 -> a
-    1522:1523:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):755:756 -> a
-    1524:1524:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1524:1524:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):756 -> a
-    1525:1529:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):760:764 -> a
-    1530:1530:java.lang.String getCompanionClassDescriptor(java.lang.String):771:771 -> a
-    1531:1534:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):776:779 -> a
-    1535:1539:com.android.tools.r8.graph.DexType getDispatchClassType(com.android.tools.r8.graph.DexType):788:792 -> a
-    1540:1549:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):837:846 -> a
-    1550:1550:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):843:843 -> a
-    1551:1551:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    1552:1552:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865:865 -> a
-    1553:1553:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):861:861 -> a
-    1553:1553:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):865 -> a
-    1554:1554:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):926:926 -> a
-    1555:1557:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameHolder(java.util.List,com.android.tools.r8.graph.DexType):930:932 -> a
-    1555:1557:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):926 -> a
-    1558:1558:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946:946 -> a
-    1559:1559:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    1559:1559:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):946 -> a
-    1560:1575:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):546:561 -> a
-    1560:1575:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):947 -> a
-    1576:1576:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):560:560 -> a
-    1576:1576:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):947 -> a
-    1577:1577:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952:952 -> a
-    1578:1580:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1057:1059 -> a
-    1578:1580:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1581:1582:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1034:1035 -> a
-    1581:1582:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1060 -> a
-    1581:1582:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1583:1587:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1061:1065 -> a
-    1583:1587:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):952 -> a
-    1588:1589:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():992:993 -> a
-    1588:1589:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
-    1590:1590:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1590:1590:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():993 -> a
-    1590:1590:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
-    1591:1592:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():994:995 -> a
-    1591:1592:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
-    1593:1608:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1005:1020 -> a
-    1593:1608:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():995 -> a
-    1593:1608:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
-    1609:1613:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1019:1023 -> a
-    1609:1613:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():995 -> a
-    1609:1613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):953 -> a
-    1614:1615:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):959:960 -> a
-    1616:1616:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():475:475 -> a
-    1616:1616:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):962 -> a
-    1617:1634:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):964:981 -> a
-    1635:1635:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    1635:1635:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):981 -> a
-    1636:1637:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():881:882 -> a
-    1636:1637:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1638:1646:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):894:902 -> a
-    1638:1646:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
-    1638:1646:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1647:1650:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):913:916 -> a
-    1647:1650:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):902 -> a
-    1647:1650:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
-    1647:1650:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1651:1651:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904:904 -> a
-    1651:1651:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
-    1651:1651:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1652:1652:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1652:1652:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):904 -> a
-    1652:1652:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
-    1652:1652:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1653:1653:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):906:906 -> a
-    1653:1653:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():883 -> a
+    12:12:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):165 -> a
+    13:14:void registerType(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexType):165:166 -> a
+    15:18:void lambda$registerType$2(com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexEncodedMethod):168:171 -> a
+    19:23:void initializeEmulatedInterfaceVariables():179:183 -> a
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    24:24:void initializeEmulatedInterfaceVariables():183 -> a
+    25:26:void initializeEmulatedInterfaceVariables():186:187 -> a
+    27:27:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):194:194 -> a
+    28:28:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> a
+    28:28:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):195 -> a
+    29:31:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):195:197 -> a
+    32:32:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):196:196 -> a
+    33:40:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):194:201 -> a
+    41:41:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):200:200 -> a
+    42:42:void addRewritePrefix(com.android.tools.r8.graph.DexType,java.lang.String):198:198 -> a
+    43:43:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):214:214 -> a
+    44:56:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):220:232 -> a
+    57:57:boolean com.android.tools.r8.ir.code.Instruction.isInvokeCustom():0:0 -> a
+    57:57:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):234 -> a
+    58:60:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):237:239 -> a
+    61:61:boolean com.android.tools.r8.graph.DexValue.isDexValueMethodHandle():0:0 -> a
+    61:61:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):240 -> a
+    62:64:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):241:241 -> a
+    71:84:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):248:261 -> a
+    85:85:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    85:85:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):534 -> a
+    85:85:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):262 -> a
+    86:86:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):534:534 -> a
+    86:86:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):262 -> a
+    87:97:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):273:283 -> a
+    98:121:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):282:305 -> a
+    122:132:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):301:311 -> a
+    133:133:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):841:841 -> a
+    133:133:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):312 -> a
+    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> a
+    134:134:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):841 -> a
+    134:134:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):312 -> a
+    135:135:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):841:841 -> a
+    135:135:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):312 -> a
+    136:136:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):313:313 -> a
+    137:137:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):311:311 -> a
+    138:138:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    138:138:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):319 -> a
+    139:147:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):320:328 -> a
+    148:148:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    148:148:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):328 -> a
+    149:149:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):339:339 -> a
+    150:151:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.amendDefaultMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):873:874 -> a
+    150:151:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):339 -> a
+    152:152:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):340:340 -> a
+    153:153:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):885:885 -> a
+    153:153:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):341 -> a
+    154:154:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):881:881 -> a
+    154:154:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):885 -> a
+    154:154:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):341 -> a
+    155:155:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):342:342 -> a
+    156:165:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):340:349 -> a
+    166:627:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
+    166:627:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):349 -> a
+    628:629:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):350:351 -> a
+    630:630:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    630:630:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):351 -> a
+    631:631:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    631:631:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):352 -> a
+    632:633:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):352:353 -> a
+    634:634:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):881:881 -> a
+    634:634:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):355 -> a
+    635:636:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):356:357 -> a
+    637:653:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):353:369 -> a
+    654:1115:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):0:461 -> a
+    654:1115:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):369 -> a
+    1116:1116:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):371:371 -> a
+    1117:1117:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1117:1117:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):371 -> a
+    1118:1118:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1118:1118:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):372 -> a
+    1119:1126:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):376:383 -> a
+    1127:1127:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> a
+    1127:1127:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):385 -> a
+    1128:1129:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):385:386 -> a
+    1130:1137:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):384:391 -> a
+    1138:1144:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):389:395 -> a
+    1145:1159:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):393:407 -> a
+    1160:1249:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    1160:1249:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):411 -> a
+    1250:1251:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):414:415 -> a
+    1252:1252:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1252:1252:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):416 -> a
+    1253:1259:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):421:427 -> a
+    1260:1260:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):895:895 -> a
+    1260:1260:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):429 -> a
+    1261:1261:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):891:891 -> a
+    1261:1261:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):895 -> a
+    1261:1261:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):429 -> a
+    1262:1263:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):430:431 -> a
+    1264:1270:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):427:433 -> a
+    1271:1271:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):885:885 -> a
+    1271:1271:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):435 -> a
+    1272:1272:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):881:881 -> a
+    1272:1272:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):885 -> a
+    1272:1272:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):435 -> a
+    1273:1274:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):436:437 -> a
+    1275:1291:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):433:449 -> a
+    1292:1300:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):445:453 -> a
+    1301:1303:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):417:419 -> a
+    1304:1304:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    1304:1304:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    1304:1304:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):419 -> a
+    1305:1345:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):419:459 -> a
+    1346:1346:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
+    1346:1346:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):459 -> a
+    1347:1359:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):460:472 -> a
+    1360:1360:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1360:1360:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):472 -> a
+    1361:1362:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):472:473 -> a
+    1363:1363:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    1363:1363:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):473 -> a
+    1364:1364:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):522:522 -> a
+    1364:1364:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):474 -> a
+    1365:1365:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1365:1365:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):522 -> a
+    1365:1365:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):474 -> a
+    1366:1369:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):522:525 -> a
+    1366:1369:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):474 -> a
+    1370:1372:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):644:646 -> a
+    1370:1372:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):527 -> a
+    1370:1372:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):474 -> a
+    1373:1373:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):643:643 -> a
+    1373:1373:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):527 -> a
+    1373:1373:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):474 -> a
+    1374:1375:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):528:529 -> a
+    1374:1375:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):474 -> a
+    1376:1376:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.rewriteCurrentInstructionToEmulatedInterfaceCall(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InstructionListIterator):525:525 -> a
+    1376:1376:void rewriteMethodReferences(com.android.tools.r8.ir.code.IRCode):474 -> a
+    1377:1380:void lambda$rewriteMethodReferences$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):286:289 -> a
+    1381:1387:void lambda$rewriteMethodReferences$4(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):288:294 -> a
+    1388:1391:com.android.tools.r8.graph.Code lambda$rewriteMethodReferences$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):296:299 -> a
+    1392:1392:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):538:538 -> a
+    1393:1393:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1393:1393:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):538 -> a
+    1394:1394:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):538:538 -> a
+    1395:1395:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    1395:1395:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):538 -> a
+    1396:1400:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):538:542 -> a
+    1401:1406:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):602:607 -> a
+    1407:1407:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1407:1407:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):607 -> a
+    1408:1417:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):609:618 -> a
+    1418:1418:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1418:1418:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):618 -> a
+    1419:1419:void processEmulatedInterfaceHierarchy(com.android.tools.r8.graph.DexType,java.util.Set,java.util.Map):620:620 -> a
+    1420:1425:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):651:656 -> a
+    1426:1432:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):655:661 -> a
+    1433:1433:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> a
+    1433:1433:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):663 -> a
+    1434:1434:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):663:663 -> a
+    1435:1453:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):662:680 -> a
+    1454:1454:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1454:1454:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):680 -> a
+    1455:1455:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681:681 -> a
+    1456:1462:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):627:633 -> a
+    1456:1462:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
+    1463:1463:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1463:1463:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):633 -> a
+    1463:1463:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
+    1464:1464:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.implementsInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):635:635 -> a
+    1464:1464:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):681 -> a
+    1465:1470:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):682:687 -> a
+    1471:1471:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):685:685 -> a
+    1472:1486:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):682:696 -> a
+    1487:1487:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1487:1487:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):696 -> a
+    1488:1492:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):697:701 -> a
+    1493:1493:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> a
+    1493:1493:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):705 -> a
+    1494:1495:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):705:706 -> a
+    1496:1496:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):704:704 -> a
+    1497:1511:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):701:715 -> a
+    1512:1514:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):644:646 -> a
+    1512:1514:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):715 -> a
+    1515:1515:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.emulateInterfaceLibraryMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):643:643 -> a
+    1515:1515:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):715 -> a
+    1516:1516:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):715:715 -> a
+    1517:1517:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):713:713 -> a
+    1518:1563:com.android.tools.r8.graph.DexProgramClass synthesizeEmulateInterfaceLibraryClass(com.android.tools.r8.graph.DexProgramClass,java.util.Map):712:757 -> a
+    1564:1565:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):775:776 -> a
+    1566:1566:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1566:1566:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):776 -> a
+    1567:1571:void reportStaticInterfaceMethodHandle(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethodHandle):780:784 -> a
+    1572:1572:java.lang.String getCompanionClassDescriptor(java.lang.String):791:791 -> a
+    1573:1576:com.android.tools.r8.graph.DexType getCompanionClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):796:799 -> a
+    1577:1586:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):857:866 -> a
+    1587:1587:com.android.tools.r8.graph.DexMethod instanceAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,java.lang.String,com.android.tools.r8.graph.DexItemFactory):863:863 -> a
+    1588:1588:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):881:881 -> a
+    1589:1589:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):885:885 -> a
+    1590:1590:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):881:881 -> a
+    1590:1590:com.android.tools.r8.graph.DexMethod defaultAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):885 -> a
+    1591:1591:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):946:946 -> a
+    1592:1594:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameHolder(java.util.List,com.android.tools.r8.graph.DexType):950:952 -> a
+    1592:1594:com.android.tools.r8.graph.DexEncodedMethod[] renameHolder(java.lang.Iterable,com.android.tools.r8.graph.DexType):946 -> a
+    1595:1595:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):966:966 -> a
+    1596:1596:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    1596:1596:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):966 -> a
+    1597:1612:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):566:581 -> a
+    1597:1612:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    1613:1613:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.generateEmulateInterfaceLibrary(com.android.tools.r8.graph.DexApplication$Builder):580:580 -> a
+    1613:1613:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):967 -> a
+    1614:1614:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):972:972 -> a
+    1615:1617:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1073:1075 -> a
+    1615:1617:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):972 -> a
+    1618:1619:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1053:1054 -> a
+    1618:1619:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1076 -> a
+    1618:1619:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):972 -> a
+    1620:1624:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processClasses(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.function.Consumer):1077:1081 -> a
+    1620:1624:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):972 -> a
+    1625:1626:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1012:1013 -> a
+    1625:1626:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):973 -> a
+    1627:1627:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1627:1627:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1013 -> a
+    1627:1627:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):973 -> a
+    1628:1629:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1014:1015 -> a
+    1628:1629:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):973 -> a
+    1630:1645:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1025:1040 -> a
+    1630:1645:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1015 -> a
+    1630:1645:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):973 -> a
+    1646:1650:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces(com.android.tools.r8.graph.DexProgramClass):1039:1043 -> a
+    1646:1650:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.transformEmulatedInterfaces():1015 -> a
+    1646:1650:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):973 -> a
+    1651:1652:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):979:980 -> a
+    1653:1653:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens.builder():598:598 -> a
     1653:1653:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1654:1656:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():884:886 -> a
-    1654:1656:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1657:1659:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):920:922 -> a
-    1657:1659:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():887 -> a
-    1657:1659:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):982 -> a
-    1660:1660:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):985:985 -> a
-    1661:1663:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.clear():1027:1029 -> a
-    1661:1663:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):988 -> a
-    1664:1668:void lambda$desugarInterfaceMethods$4(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):974:978 -> a
-    1669:1670:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1042:1043 -> a
-    1671:1672:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1034:1035 -> a
-    1671:1672:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1044 -> a
-    1673:1680:java.util.Map processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):1045:1052 -> a
-    1681:1695:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1069:1083 -> a
-    1696:1696:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1076:1076 -> a
-    1697:1697:boolean lambda$shouldIgnoreFromReports$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfiguration):1126:1126 -> a
-    1698:1704:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1143:1149 -> a
-    1705:1705:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1165:1165 -> a
-    1706:1707:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1178:1179 -> a
-    1706:1707:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1708:1708:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1708:1708:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1179 -> a
-    1708:1708:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1709:1712:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1134:1137 -> a
-    1709:1712:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1181 -> a
-    1709:1712:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1713:1715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1182:1184 -> a
-    1713:1715:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1716:1716:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1716:1716:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514 -> a
-    1716:1716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1190 -> a
-    1716:1716:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1717:1717:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):514:514 -> a
-    1717:1717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1190 -> a
-    1717:1717:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1718:1744:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1195:1221 -> a
-    1718:1744:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1745:1745:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1170:1170 -> a
-    1746:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185:1187 -> a
-    1746:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1749:1749:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1749:1749:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1187 -> a
-    1749:1749:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1750:1750:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1187:1187 -> a
-    1750:1750:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1169 -> a
-    1751:1751:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226:1226 -> a
-    1752:1752:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1752:1752:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226 -> a
-    1753:1753:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1226:1226 -> a
-    1754:1754:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    1754:1754:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1227 -> a
-    1755:1756:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1227:1228 -> a
-    1757:1757:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
-    1757:1757:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1230 -> a
-    1758:1762:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1232:1236 -> a
-    1763:1763:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
-    1763:1763:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1245 -> a
-    1763:1763:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1237 -> a
-    1764:1764:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1247:1247 -> a
-    1764:1764:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1237 -> a
-    1765:1765:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
-    1765:1765:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1245 -> a
-    1765:1765:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1234 -> a
-    1766:1766:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1247:1247 -> a
-    1766:1766:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1234 -> a
-    1:1:com.android.tools.r8.graph.DexType getEmulatedInterface(com.android.tools.r8.graph.DexType):218:218 -> b
-    2:3:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):527:528 -> b
-    4:9:java.util.Map processEmulatedInterfaceHierarchy():568:573 -> b
-    10:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):748:749 -> b
-    12:12:java.lang.String com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):742:742 -> b
-    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):750 -> b
-    13:13:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):751:751 -> b
-    14:17:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1134:1137 -> b
-    1:1:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
-    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:811 -> c
-    3:3:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> c
-    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811 -> c
-    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):811:814 -> c
-    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):813:815 -> c
-    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1153:1154 -> c
-    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):806:806 -> c
-    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1155 -> c
-    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1157:1157 -> c
-    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
-    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1157 -> c
-    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1158:1158 -> c
-    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> c
-    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1158 -> c
-    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):210:210 -> d
-    2:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):465:468 -> d
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
-    6:6:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):468 -> d
-    7:24:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):474:491 -> d
-    25:25:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterface(com.android.tools.r8.graph.DexType):210:210 -> d
-    25:25:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):491 -> d
-    26:26:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):492:492 -> d
-    1:1:boolean needsRewriting(com.android.tools.r8.graph.DexMethod):214:214 -> e
-    2:2:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1120:1120 -> e
-    3:3:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> e
-    3:3:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1120 -> e
-    4:4:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1121:1121 -> e
-    5:5:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):797:797 -> e
-    5:5:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1122 -> e
-    6:9:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1122:1125 -> e
-    10:14:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1124:1128 -> e
-    1:6:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):536:541 -> f
-    7:7:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875:875 -> f
-    8:8:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):871:871 -> f
-    8:8:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):875 -> f
-    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> g
-    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> g
-    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821 -> g
-    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):821:821 -> g
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.Xf$a:
+    1654:1654:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):983:983 -> a
+    1655:1656:java.util.Map com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):1062:1063 -> a
+    1655:1656:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):984 -> a
+    1657:1658:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.shouldProcess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,boolean):1053:1054 -> a
+    1657:1658:java.util.Map com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):1064 -> a
+    1657:1658:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):984 -> a
+    1659:1662:java.util.Map com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.processInterfaces(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):1065:1068 -> a
+    1659:1662:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):984 -> a
+    1663:1679:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):985:1001 -> a
+    1680:1680:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    1680:1680:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1001 -> a
+    1681:1682:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():901:902 -> a
+    1681:1682:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1683:1691:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):914:922 -> a
+    1683:1691:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():903 -> a
+    1683:1691:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1692:1695:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):933:936 -> a
+    1692:1695:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):922 -> a
+    1692:1695:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():903 -> a
+    1692:1695:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1696:1696:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):924:924 -> a
+    1696:1696:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():903 -> a
+    1696:1696:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1697:1697:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1697:1697:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):924 -> a
+    1697:1697:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():903 -> a
+    1697:1697:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1698:1698:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.inferEmulatedInterfaceName(com.android.tools.r8.graph.DexClass):926:926 -> a
+    1698:1698:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():903 -> a
+    1698:1698:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1699:1701:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():904:906 -> a
+    1699:1701:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1702:1704:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):940:942 -> a
+    1702:1704:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.renameEmulatedInterfaces():907 -> a
+    1702:1704:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1002 -> a
+    1705:1705:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1005:1005 -> a
+    1706:1707:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.clear():1047:1048 -> a
+    1706:1707:void desugarInterfaceMethods(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor,java.util.concurrent.ExecutorService):1008 -> a
+    1708:1712:void lambda$desugarInterfaceMethods$5(com.android.tools.r8.graph.DexApplication$Builder,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.AppInfo,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass):994:998 -> a
+    1713:1727:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1085:1099 -> a
+    1728:1728:boolean isDefaultMethod(com.android.tools.r8.graph.DexEncodedMethod):1092:1092 -> a
+    1729:1729:boolean lambda$shouldIgnoreFromReports$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfiguration):1142:1142 -> a
+    1730:1736:void warnMissingType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):1159:1165 -> a
+    1737:1737:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1181:1181 -> a
+    1738:1739:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1194:1195 -> a
+    1738:1739:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1740:1740:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1740:1740:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1195 -> a
+    1740:1740:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1741:1744:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1150:1153 -> a
+    1741:1744:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1197 -> a
+    1741:1744:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1745:1747:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1198:1200 -> a
+    1745:1747:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1748:1748:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1748:1748:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):534 -> a
+    1748:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1206 -> a
+    1748:1748:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1749:1749:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isNonDesugaredLibraryClass(com.android.tools.r8.graph.DexClass):534:534 -> a
+    1749:1749:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1206 -> a
+    1749:1749:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1750:1776:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1211:1237 -> a
+    1750:1776:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1777:1777:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1186:1186 -> a
+    1778:1780:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1201:1203 -> a
+    1778:1780:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1781:1781:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1781:1781:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1203 -> a
+    1781:1781:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1782:1782:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.createInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1203:1203 -> a
+    1782:1782:com.android.tools.r8.ir.desugar.DefaultMethodsHelper$Collection getOrCreateInterfaceInfo(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1185 -> a
+    1783:1783:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1242:1242 -> a
+    1784:1784:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1784:1784:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1242 -> a
+    1785:1785:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1242:1242 -> a
+    1786:1786:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    1786:1786:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1243 -> a
+    1787:1788:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1243:1244 -> a
+    1789:1789:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
+    1789:1789:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1246 -> a
+    1790:1794:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1248:1252 -> a
+    1795:1795:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
+    1795:1795:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1261 -> a
+    1795:1795:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1253 -> a
+    1796:1796:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1263:1263 -> a
+    1796:1796:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1253 -> a
+    1797:1797:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
+    1797:1797:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1261 -> a
+    1797:1797:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1250 -> a
+    1798:1798:void com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.reportDependencyEdge(com.android.tools.r8.DesugarGraphConsumer,com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexClass):1263:1263 -> a
+    1798:1798:void reportDependencyEdge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.InternalOptions):1250 -> a
+    1:2:boolean dontRewrite(com.android.tools.r8.graph.DexMethod):547:548 -> b
+    3:8:java.util.Map processEmulatedInterfaceHierarchy():588:593 -> b
+    9:10:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):768:769 -> b
+    11:11:java.lang.String com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getEmulateLibraryInterfaceClassDescriptor(java.lang.String):762:762 -> b
+    11:11:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):770 -> b
+    12:12:com.android.tools.r8.graph.DexType getEmulateLibraryInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):771:771 -> b
+    13:13:boolean isCompanionClassType(com.android.tools.r8.graph.DexType):817:817 -> b
+    14:17:void warnMissingInterface(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1150:1153 -> b
+    1:1:boolean isEmulatedInterface(com.android.tools.r8.graph.DexType):206:206 -> c
+    2:2:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):831:831 -> c
+    3:3:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):817:817 -> c
+    3:3:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):831 -> c
+    4:7:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):831:834 -> c
+    8:10:com.android.tools.r8.graph.DexType getInterfaceClassType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):833:835 -> c
+    11:12:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1169:1170 -> c
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getInterfaceClassType(com.android.tools.r8.graph.DexType):826:826 -> c
+    13:13:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1171 -> c
+    14:14:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1173:1173 -> c
+    15:15:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
+    15:15:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1173 -> c
+    16:16:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1174:1174 -> c
+    17:17:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> c
+    17:17:com.android.tools.r8.origin.Origin getMethodOrigin(com.android.tools.r8.graph.DexMethod):1174 -> c
+    1:4:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):485:488 -> d
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> d
+    5:5:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):488 -> d
+    6:23:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):494:511 -> d
+    24:24:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedInterface(com.android.tools.r8.graph.DexType):206:206 -> d
+    24:24:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):511 -> d
+    25:25:com.android.tools.r8.graph.DexType maximallySpecificEmulatedInterfaceOrNull(com.android.tools.r8.graph.DexMethod):512:512 -> d
+    26:26:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1136:1136 -> d
+    27:27:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> d
+    27:27:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1136 -> d
+    28:28:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1137:1137 -> d
+    29:29:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):817:817 -> d
+    29:29:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1138 -> d
+    30:33:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1138:1141 -> d
+    34:38:boolean shouldIgnoreFromReports(com.android.tools.r8.graph.DexType):1140:1144 -> d
+    1:1:boolean needsRewriting(com.android.tools.r8.graph.DexMethod):210:210 -> e
+    2:7:void warnMissingEmulatedInterface(com.android.tools.r8.graph.DexType):556:561 -> e
+    1:1:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):895:895 -> f
+    2:2:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):891:891 -> f
+    2:2:com.android.tools.r8.graph.DexMethod privateAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):895 -> f
+    1:1:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):841:841 -> g
+    2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> g
+    2:2:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):841 -> g
+    3:3:com.android.tools.r8.graph.DexMethod staticAsMethodOfCompanionClass(com.android.tools.r8.graph.DexMethod):841:841 -> g
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor -> com.android.tools.r8.internal.kg$a:
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor ExcludeDexResources -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter$Flavor IncludeAllResources -> a
-    1:5:void <clinit>():134:138 -> <clinit>
-    1:1:void <init>(java.lang.String,int):130:130 -> <init>
-com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.Yf:
+    1:5:void <clinit>():130:134 -> <clinit>
+    1:1:void <init>(java.lang.String,int):126:126 -> <init>
+com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup -> com.android.tools.r8.internal.lg:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens graphLens -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens):17:19 -> <init>
@@ -36698,104 +36981,184 @@
     23:23:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.ir.desugar.InterfaceMethodRewriterFixup.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):47:47 -> a
     23:23:void run():36 -> a
     24:24:void run():35:35 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.internal.Zf:
+com.android.tools.r8.ir.desugar.InterfaceProcessor -> com.android.tools.r8.internal.mg:
     java.util.Map syntheticClasses -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.desugar.InterfaceMethodRewriter rewriter -> c
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():57:57 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):66:66 -> <init>
-    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):63:68 -> <init>
-    long lambda$getChecksumSupplier$0(long,com.android.tools.r8.graph.DexProgramClass) -> a
-    1:8:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):72:79 -> a
-    9:20:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):320:331 -> a
-    9:20:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):80 -> a
-    21:33:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):86:98 -> a
-    34:41:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):97:104 -> a
-    42:42:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
-    42:42:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
-    42:42:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):104 -> a
-    43:46:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):108:111 -> a
-    47:48:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):90:91 -> a
-    49:49:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    49:49:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    49:49:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):91 -> a
-    50:50:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):91:91 -> a
-    51:52:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):81:82 -> a
-    53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    53:53:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    53:53:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):82 -> a
-    54:54:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):82:82 -> a
-    55:66:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):350:361 -> a
-    55:66:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):115 -> a
-    67:69:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.InterfaceProcessor.definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):340:342 -> a
-    67:69:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):361 -> a
-    67:69:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):115 -> a
-    70:70:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    70:70:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.InterfaceProcessor.definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):342 -> a
-    70:70:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):361 -> a
-    70:70:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):115 -> a
-    71:77:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):362:368 -> a
-    71:77:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):115 -> a
-    78:96:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):116:134 -> a
-    97:100:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):384:387 -> a
-    97:100:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):135 -> a
-    101:112:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):136:147 -> a
-    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
-    113:113:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
-    113:113:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):147 -> a
-    114:132:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):149:167 -> a
-    133:140:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):166:173 -> a
-    141:141:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
-    141:141:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
-    141:141:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):173 -> a
-    142:144:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):177:179 -> a
-    145:146:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):163:164 -> a
-    147:147:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
-    147:147:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
-    147:147:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):164 -> a
-    148:168:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):164:184 -> a
-    169:169:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):385:385 -> a
-    169:169:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):135 -> a
-    170:188:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):188:206 -> a
-    189:189:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):783:783 -> a
-    189:189:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):206 -> a
-    190:212:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):207:229 -> a
-    213:217:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):233:237 -> a
-    218:242:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):241:265 -> a
-    243:243:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.staticAsMethodOfDispatchClass(com.android.tools.r8.graph.DexMethod):826:826 -> a
-    243:243:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):265 -> a
-    244:256:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):269:281 -> a
-    257:257:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
-    257:257:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
-    257:257:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):281 -> a
-    258:259:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):283:284 -> a
-    260:317:com.android.tools.r8.graph.DexProgramClass process(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):258:315 -> a
-    318:322:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):375:379 -> a
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.Zf$a:
+    1:1:void <clinit>():72:72 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):81:81 -> <init>
+    2:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.InterfaceMethodRewriter):78:83 -> <init>
+    long lambda$getChecksumSupplier$2(long,com.android.tools.r8.graph.DexProgramClass) -> a
+    1:3:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):90:92 -> a
+    4:11:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):148:155 -> a
+    4:11:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    12:12:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):193:193 -> a
+    12:12:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    12:12:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    13:13:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):193 -> a
+    13:13:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    13:13:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    14:14:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):194:194 -> a
+    14:14:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    14:14:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    15:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClinitMethod(com.android.tools.r8.graph.DexType):2184:2184 -> a
+    15:15:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):194 -> a
+    15:15:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    15:15:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    16:16:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):195:195 -> a
+    16:16:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    16:16:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    17:17:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> a
+    17:17:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):202 -> a
+    17:17:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    17:17:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    18:18:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):202:202 -> a
+    18:18:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    18:18:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    19:34:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):200:215 -> a
+    19:34:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    19:34:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    35:35:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    35:35:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.desugar.InterfaceProcessor.createCompanionClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedField):215 -> a
+    35:35:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157 -> a
+    35:35:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    36:36:void com.android.tools.r8.ir.desugar.InterfaceProcessor.ensureCompanionClassInitializesInterface(com.android.tools.r8.graph.DexProgramClass,java.util.List):157:157 -> a
+    36:36:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):94 -> a
+    37:39:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):222:224 -> a
+    37:39:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    40:51:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.canMoveToCompanionClass(com.android.tools.r8.graph.DexEncodedMethod):443:454 -> a
+    40:51:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):225 -> a
+    40:51:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    52:64:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):231:243 -> a
+    52:64:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    65:72:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):242:249 -> a
+    65:72:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    73:73:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    73:73:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
+    73:73:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):249 -> a
+    73:73:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    74:77:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):253:256 -> a
+    74:77:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    78:79:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):235:236 -> a
+    78:79:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    80:80:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    80:80:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    80:80:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):236 -> a
+    80:80:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    81:81:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):236:236 -> a
+    81:81:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    82:83:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):226:227 -> a
+    82:83:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    84:84:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    84:84:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    84:84:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):227 -> a
+    84:84:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    85:85:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):227:227 -> a
+    85:85:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    86:97:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):473:484 -> a
+    86:97:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):260 -> a
+    86:97:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    98:100:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.InterfaceProcessor.definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):463:465 -> a
+    98:100:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):484 -> a
+    98:100:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):260 -> a
+    98:100:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    101:101:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    101:101:com.android.tools.r8.graph.DexClass com.android.tools.r8.ir.desugar.InterfaceProcessor.definitionForDependency(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):465 -> a
+    101:101:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):484 -> a
+    101:101:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):260 -> a
+    101:101:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    102:108:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.interfaceMethodRemovalChangesApi(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):485:491 -> a
+    102:108:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):260 -> a
+    102:108:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    109:115:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processVirtualInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):261:267 -> a
+    109:115:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):97 -> a
+    116:124:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):276:284 -> a
+    116:124:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    125:125:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
+    125:125:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):288 -> a
+    125:125:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    126:131:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):289:294 -> a
+    126:131:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    132:135:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):507:510 -> a
+    132:135:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):295 -> a
+    132:135:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    136:150:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):296:310 -> a
+    136:150:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    151:151:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    151:151:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
+    151:151:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):310 -> a
+    151:151:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    152:178:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):312:338 -> a
+    152:178:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    179:179:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    179:179:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261 -> a
+    179:179:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):338 -> a
+    179:179:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    180:182:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):342:344 -> a
+    180:182:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    183:186:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):326:329 -> a
+    183:186:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    187:187:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
+    187:187:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30 -> a
+    187:187:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):329 -> a
+    187:187:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    188:188:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):329:329 -> a
+    188:188:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    189:189:boolean com.android.tools.r8.ir.desugar.InterfaceProcessor.isStaticMethod(com.android.tools.r8.graph.DexEncodedMethod):508:508 -> a
+    189:189:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):295 -> a
+    189:189:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    190:190:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):347:347 -> a
+    190:190:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    191:487:void com.android.tools.r8.graph.MethodCollection.setSingleDirectMethod(com.android.tools.r8.graph.DexEncodedMethod):0:296 -> a
+    191:487:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):349 -> a
+    191:487:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    488:488:void com.android.tools.r8.ir.desugar.InterfaceProcessor.processDirectInterfaceMethods(com.android.tools.r8.graph.DexProgramClass,java.util.List,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder):351:351 -> a
+    488:488:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):101 -> a
+    489:503:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):103:117 -> a
+    504:504:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.getCompanionClassType(com.android.tools.r8.graph.DexType):803:803 -> a
+    504:504:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):117 -> a
+    505:529:void process(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder,java.util.function.Consumer):118:142 -> a
+    530:530:boolean lambda$hasStaticMethodThatTriggersNonTrivialClassInitializer$0(com.android.tools.r8.graph.DexEncodedMethod):164:164 -> a
+    531:537:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):177:183 -> a
+    538:538:com.android.tools.r8.graph.FieldAccessFlags$Builder com.android.tools.r8.graph.FieldAccessFlags.builder():48:48 -> a
+    538:538:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):185 -> a
+    539:541:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):185:187 -> a
+    542:542:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
+    542:542:com.android.tools.r8.graph.DexEncodedField createStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):187 -> a
+    543:543:boolean lambda$createStaticClinitFieldToTriggerInterfaceInitialization$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField):182:182 -> a
+    544:548:void addSuperTypes(com.android.tools.r8.graph.DexClass,java.util.Deque):498:502 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):169:169 -> b
+    2:2:java.lang.Iterable com.android.tools.r8.graph.DexClass.staticFields(java.util.function.Predicate):276:276 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):169 -> b
+    3:3:com.android.tools.r8.graph.DexEncodedField findExistingStaticClinitFieldToTriggerInterfaceInitialization(com.android.tools.r8.graph.DexProgramClass):169:169 -> b
+    1:5:com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier getChecksumSupplier(com.android.tools.r8.graph.DexProgramClass):356:360 -> c
+    1:4:boolean hasStaticMethodThatTriggersNonTrivialClassInitializer(com.android.tools.r8.graph.DexProgramClass):161:164 -> d
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens -> com.android.tools.r8.internal.mg$a:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.com.google.common.collect.BiMap extraOriginalMethodSignatures -> n
-    1:1:void <clinit>():392:392 -> <clinit>
-    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):405:413 -> <init>
+    1:1:void <clinit>():515:515 -> <clinit>
+    1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):528:536 -> <init>
     com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens asInterfaceProcessorLens() -> a
     1:1:boolean com.android.tools.r8.graph.GraphLens.isInterfaceProcessorLens():0:0 -> a
-    1:1:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):417 -> a
-    2:10:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):418:426 -> a
-    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):471:471 -> b
-    1:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):457:457 -> f
-    1:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):463:466 -> g
-    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):465:465 -> g
-    1:1:com.android.tools.r8.com.google.common.collect.BiMap getExtraOriginalMethodSignatures():437:437 -> l
-    1:3:void toggleMappingToExtraMethods():431:433 -> m
-com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.Zf$a$a:
+    1:1:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):540 -> a
+    2:10:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens find(com.android.tools.r8.graph.GraphLens):541:549 -> a
+    1:1:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):594:594 -> b
+    1:3:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):580:580 -> f
+    1:4:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):586:589 -> g
+    5:5:com.android.tools.r8.graph.DexMethod internalGetNextMethodSignature(com.android.tools.r8.graph.DexMethod):588:588 -> g
+    1:1:com.android.tools.r8.com.google.common.collect.BiMap getExtraOriginalMethodSignatures():560:560 -> l
+    1:3:void toggleMappingToExtraMethods():554:556 -> m
+com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens$Builder -> com.android.tools.r8.internal.mg$a$a:
     boolean $assertionsDisabled -> f
     com.android.tools.r8.com.google.common.collect.BiMap extraOriginalMethodSignatures -> g
-    1:1:void <clinit>():478:478 -> <clinit>
-    1:3:void <init>():478:480 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):478:478 -> a
-    1:6:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):491:496 -> b
-    1:3:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):483:485 -> c
-com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.ul:
+    1:1:void <clinit>():601:601 -> <clinit>
+    1:3:void <init>():601:603 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):601:601 -> a
+    1:6:com.android.tools.r8.ir.desugar.InterfaceProcessor$InterfaceProcessorNestedGraphLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens):614:619 -> b
+    1:3:void recordCodeMovedToCompanionClass(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):606:608 -> c
+com.android.tools.r8.ir.desugar.LambdaClass -> com.android.tools.r8.internal.Hl:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.desugar.LambdaDescriptor descriptor -> e
     com.android.tools.r8.ir.desugar.LambdaRewriter rewriter -> c
@@ -36817,7 +37180,7 @@
     16:16:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):354:354 -> a
     17:43:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):377:403 -> a
     17:43:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):355 -> a
-    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    44:44:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     44:44:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):404 -> a
     44:44:com.android.tools.r8.ir.desugar.LambdaClass$Target createTarget(com.android.tools.r8.graph.ProgramMethod):355 -> a
     45:68:com.android.tools.r8.ir.desugar.LambdaClass$Target com.android.tools.r8.ir.desugar.LambdaClass.createLambdaImplMethodTarget(com.android.tools.r8.graph.ProgramMethod):404:427 -> a
@@ -36905,7 +37268,7 @@
     202:202:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.ir.desugar.LambdaClass.synthesizeVirtualMethods(com.android.tools.r8.graph.DexMethod):259:259 -> d
     202:202:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171 -> d
     203:212:com.android.tools.r8.graph.DexProgramClass synthesizeLambdaClass():171:180 -> d
-com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.ol:
+com.android.tools.r8.ir.desugar.LambdaClass$ClassMethodWithAccessorTarget -> com.android.tools.r8.internal.Bl:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
     1:1:void <clinit>():748:748 -> <clinit>
@@ -36923,13 +37286,13 @@
     77:77:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):774 -> a
     78:82:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):778:782 -> a
     83:83:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):780:780 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.pl:
+com.android.tools.r8.ir.desugar.LambdaClass$InstanceLambdaImplTarget -> com.android.tools.r8.internal.Cl:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
     1:1:void <clinit>():665:665 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):667:668 -> <init>
     1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):674:678 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     6:6:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):678 -> a
     7:10:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):678:681 -> a
     11:24:com.android.tools.r8.graph.DexEncodedMethod lambda$modifyLambdaImplementationMethod$0(com.android.tools.r8.graph.DexEncodedMethod):692:705 -> a
@@ -36946,13 +37309,13 @@
     72:75:com.android.tools.r8.graph.ProgramMethod createSyntheticAccessor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):739:742 -> a
     76:76:void lambda$createSyntheticAccessor$1(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.UseRegistry):737:737 -> a
     1:24:com.android.tools.r8.graph.ProgramMethod modifyLambdaImplementationMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass):688:711 -> b
-com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.ql:
+com.android.tools.r8.ir.desugar.LambdaClass$InterfaceLambdaImplTarget -> com.android.tools.r8.internal.Dl:
     boolean $assertionsDisabled -> g
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> h
     1:1:void <clinit>():597:597 -> <clinit>
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):599:600 -> <init>
     1:2:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):607:608 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     3:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):608 -> a
     4:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):608:645 -> a
     42:56:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):618:632 -> a
@@ -36960,18 +37323,18 @@
     57:57:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):632 -> a
     58:62:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):634:638 -> a
     63:63:com.android.tools.r8.graph.DexEncodedMethod lambda$ensureAccessibility$0(com.android.tools.r8.graph.DexEncodedMethod):637:637 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.rl:
+com.android.tools.r8.ir.desugar.LambdaClass$InvalidLambdaImplTarget -> com.android.tools.r8.internal.El:
     com.android.tools.r8.graph.DexType exceptionType -> g
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexType):654:655 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.sl:
+com.android.tools.r8.ir.desugar.LambdaClass$NoAccessorMethodTarget -> com.android.tools.r8.internal.Fl:
     1:1:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.ir.code.Invoke$Type):565:565 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
-com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.tl:
+com.android.tools.r8.ir.desugar.LambdaClass$StaticLambdaImplTarget -> com.android.tools.r8.internal.Gl:
     com.android.tools.r8.graph.ProgramMethod target -> g
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.ProgramMethod):580:581 -> <init>
     1:3:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean):587:589 -> a
-com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.ul$a:
+com.android.tools.r8.ir.desugar.LambdaClass$Target -> com.android.tools.r8.internal.Hl$a:
     com.android.tools.r8.graph.ProgramMethod accessibilityBridge -> e
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> c
     com.android.tools.r8.ir.desugar.LambdaClass this$0 -> f
@@ -36982,10 +37345,10 @@
     1:5:void <init>(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):537:541 -> <init>
     com.android.tools.r8.graph.ProgramMethod ensureAccessibility(boolean) -> a
     1:5:com.android.tools.r8.graph.ProgramMethod ensureAccessibilityIfNeeded(boolean):549:553 -> b
-com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.vl:
+com.android.tools.r8.ir.desugar.LambdaConstructorSourceCode -> com.android.tools.r8.internal.Il:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
-com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.wl:
+com.android.tools.r8.ir.desugar.LambdaDescriptor -> com.android.tools.r8.internal.Jl:
     com.android.tools.r8.graph.MethodAccessFlags targetAccessFlags -> l
     com.android.tools.r8.graph.DexMethodHandle implHandle -> h
     com.android.tools.r8.graph.DexType targetHolder -> m
@@ -37037,13 +37400,13 @@
     1:4:com.android.tools.r8.graph.DexType getImplReceiverType():109:112 -> b
     5:6:com.android.tools.r8.ir.desugar.LambdaDescriptor tryInfer(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod):259:260 -> b
     1:1:com.android.tools.r8.graph.DexMethod getMainMethod():66:66 -> c
-com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.Bl:
+com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode -> com.android.tools.r8.internal.Ol:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():39:39 -> <clinit>
     1:12:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):71:82 -> a
     13:13:com.android.tools.r8.graph.DexType getBoxedForPrimitiveType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):80:80 -> a
     14:45:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):92:123 -> a
-    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):597:597 -> a
+    46:46:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):600:600 -> a
     46:46:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):130 -> a
     47:56:boolean isSameOrAdaptableTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):131:140 -> a
     57:57:boolean isSameOrAdaptableTo(byte,byte):165:165 -> a
@@ -37073,7 +37436,7 @@
     197:215:com.android.tools.r8.graph.CfCode build(com.android.tools.r8.ir.desugar.LambdaClass,com.android.tools.r8.graph.DexMethod):264:282 -> a
     216:234:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):381:399 -> a
     216:234:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):365 -> a
-    235:235:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):597:597 -> a
+    235:235:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexItemFactory.getPrimitiveFromBoxed(com.android.tools.r8.graph.DexType):600:600 -> a
     235:235:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.internalAdjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):401 -> a
     235:235:int adjustType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):365 -> a
     236:236:void com.android.tools.r8.ir.desugar.LambdaMainMethodSourceCode.addPrimitiveUnboxing(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder,com.android.tools.r8.graph.DexItemFactory):546:546 -> a
@@ -37118,7 +37481,7 @@
     356:359:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):477:480 -> a
     360:360:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):471:471 -> a
     361:404:void addPrimitiveWideningConversion(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):463:506 -> a
-com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.internal.Ml:
+com.android.tools.r8.ir.desugar.LambdaRewriter -> com.android.tools.r8.internal.Zl:
     com.android.tools.r8.graph.DexString instanceFieldName -> c
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set forcefullyMovedMethods -> e
@@ -37149,7 +37512,7 @@
     237:243:java.lang.Object com.android.tools.r8.ir.desugar.LambdaRewriter.putIfAbsent(java.util.Map,java.lang.Object,java.lang.Object):318:324 -> a
     237:243:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):262 -> a
     244:248:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):262:266 -> a
-    249:249:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
+    249:249:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
     249:249:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):266 -> a
     250:258:com.android.tools.r8.ir.desugar.LambdaClass getOrCreateLambdaClass(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):267:275 -> a
     259:271:void com.android.tools.r8.ir.desugar.LambdaRewriter.addRewritingPrefix(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):296:308 -> a
@@ -37171,18 +37534,18 @@
     283:307:com.android.tools.r8.graph.GraphLens$NestedGraphLens fixup():409:433 -> a
     1:1:java.util.Set getForcefullyMovedMethods():106:106 -> b
     1:1:java.util.Map getKnownLambdaClasses():405:405 -> c
-com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens -> com.android.tools.r8.internal.Ll:
+com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens -> com.android.tools.r8.internal.Yl:
     1:1:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):446:446 -> <init>
     1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens.withoutMethodMap():462:462 -> a
     1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens access$000(com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens):436 -> a
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:1:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder builder():467:467 -> l
-com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder -> com.android.tools.r8.internal.Kl:
+com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens$Builder -> com.android.tools.r8.internal.Xl:
     boolean $assertionsDisabled -> f
     1:1:void <clinit>():470:470 -> <clinit>
     1:1:void <init>():470:470 -> <init>
     1:6:com.android.tools.r8.ir.desugar.LambdaRewriter$LambdaRewriterLens build(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory):472:477 -> a
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.internal.zp:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring -> com.android.tools.r8.internal.Lp:
     java.util.Map bridges -> c
     java.util.Map getFieldBridges -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -37196,7 +37559,7 @@
     void reportIncompleteNest(java.util.List) -> a
     boolean shouldProcessClassInNest(com.android.tools.r8.graph.DexClass,java.util.List) -> a
     1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):85:85 -> a
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     2:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):85 -> a
     3:17:com.android.tools.r8.utils.Pair extractNest(com.android.tools.r8.graph.DexClass):102:116 -> a
     18:18:java.util.concurrent.Future asyncProcessNest(com.android.tools.r8.graph.DexProgramClass,java.util.concurrent.ExecutorService):120:120 -> a
@@ -37236,12 +37599,12 @@
     103:104:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):307:308 -> a
     105:106:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):250:251 -> a
     105:106:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    107:107:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    107:107:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     107:107:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):253 -> a
     107:107:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
     108:111:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):253:256 -> a
     108:111:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    112:112:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    112:112:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     112:112:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):258 -> a
     112:112:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
     113:118:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):259:264 -> a
@@ -37249,14 +37612,14 @@
     119:119:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):218:218 -> a
     119:119:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     119:119:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    120:120:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    120:120:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     120:120:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):220 -> a
     120:120:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     120:120:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
     121:123:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):221:223 -> a
     121:123:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     121:123:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
-    124:124:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    124:124:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     124:124:com.android.tools.r8.graph.DexString com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridgeName(com.android.tools.r8.graph.DexEncodedField,boolean):224 -> a
     124:124:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring.computeFieldBridge(com.android.tools.r8.graph.DexEncodedField,boolean):265 -> a
     124:124:com.android.tools.r8.graph.DexMethod ensureFieldAccessBridge(com.android.tools.r8.graph.DexEncodedField,boolean):309 -> a
@@ -37282,7 +37645,7 @@
     18:20:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):333 -> b
     21:29:com.android.tools.r8.graph.DexMethod ensureInvokeBridge(com.android.tools.r8.graph.DexEncodedMethod):335:343 -> b
     void reportMissingNestHost(com.android.tools.r8.graph.DexClass) -> c
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.internal.zp$a:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess -> com.android.tools.r8.internal.Lp$a:
     com.android.tools.r8.graph.DexEncodedField field -> a
     boolean isGet -> b
     1:3:void <init>(com.android.tools.r8.graph.DexEncodedField,boolean):461:463 -> <init>
@@ -37301,7 +37664,7 @@
     2:2:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isGet():484:484 -> g
     2:2:boolean isStaticGet():500 -> g
     1:1:int hashCode():468:468 -> hashCode
-com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.Ap:
+com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$NestBasedAccessDesugaringUseRegistry -> com.android.tools.r8.internal.Mp:
     com.android.tools.r8.graph.DexClassAndMethod context -> c
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring this$0 -> d
     1:3:void <init>(com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring,com.android.tools.r8.graph.DexClassAndMethod):357:359 -> <init>
@@ -37332,17 +37695,17 @@
     197:197:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):398:398 -> a
     198:198:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):425:425 -> a
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):410:410 -> b
+    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
     1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):403:403 -> c
     2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):420:420 -> c
-    void registerInitClass(com.android.tools.r8.graph.DexType) -> d
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):415:415 -> d
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> e
+    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):393:393 -> e
     2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):437:437 -> e
-    void registerNewInstance(com.android.tools.r8.graph.DexType) -> f
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):442:442 -> g
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLens -> com.android.tools.r8.internal.Gp:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLens -> com.android.tools.r8.internal.Sp:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.DexType nestConstructorType -> n
     java.util.Map getFieldMap -> o
@@ -37365,7 +37728,7 @@
     2:2:boolean verifyIsContextFreeForMethod(com.android.tools.r8.graph.DexMethod):79:79 -> e
     1:6:boolean isConstructorBridge(com.android.tools.r8.graph.DexMethod):90:95 -> h
     boolean isLegitimateToHaveEmptyMappings() -> k
-com.android.tools.r8.ir.desugar.NestedPrivateMethodLens$Builder -> com.android.tools.r8.internal.Fp:
+com.android.tools.r8.ir.desugar.NestedPrivateMethodLens$Builder -> com.android.tools.r8.internal.Rp:
     boolean $assertionsDisabled -> f
     java.util.Map getFieldMap -> g
     java.util.Map putFieldMap -> h
@@ -37374,7 +37737,7 @@
     1:1:void mapGetField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):145:145 -> a
     2:8:com.android.tools.r8.ir.desugar.NestedPrivateMethodLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):153:159 -> a
     1:1:void mapPutField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):149:149 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.Ss:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper -> com.android.tools.r8.internal.et:
     1:1:void <init>():23:23 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
@@ -37382,7 +37745,7 @@
     1:1:boolean hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:6:boolean hasRewrittenTypeInSignature(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.AppView):38:42 -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.Ss$a:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper -> com.android.tools.r8.internal.et$a:
     java.util.Map rewritten -> c
     java.util.Map initialPrefixes -> d
     com.android.tools.r8.graph.DexItemFactory factory -> e
@@ -37421,7 +37784,7 @@
     19:23:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):126:130 -> b
     19:23:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):162 -> b
     19:23:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
-    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    24:24:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     24:24:void com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.failIfRewritingProgramType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131 -> b
     24:24:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):162 -> b
     24:24:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
@@ -37430,13 +37793,13 @@
     25:29:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
     30:30:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.desugar.PrefixRewritingMapper$DesugarPrefixRewritingMapper.computePrefix(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):165:165 -> b
     30:30:com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):121 -> b
-com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.Ts:
+com.android.tools.r8.ir.desugar.PrefixRewritingMapper$EmptyPrefixRewritingMapper -> com.android.tools.r8.internal.ft:
     1:1:void <init>():189:189 -> <init>
     void forAllRewrittenTypes(java.util.function.Consumer) -> a
     boolean isRewriting() -> a
     void rewriteType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexType rewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView) -> b
-com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.internal.sv:
+com.android.tools.r8.ir.desugar.R8NestBasedAccessDesugaring -> com.android.tools.r8.internal.Nv:
     boolean $assertionsDisabled -> h
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView):33:33 -> <init>
@@ -37454,7 +37817,7 @@
     31:36:void addDeferredBridgesAndMapMethods(java.util.Map,java.util.function.BiConsumer):58:63 -> a
     37:40:void reportIncompleteNest(java.util.List):113:116 -> a
     1:4:void reportMissingNestHost(com.android.tools.r8.graph.DexClass):104:107 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.internal.cz:
+com.android.tools.r8.ir.desugar.StringConcatRewriter -> com.android.tools.r8.internal.vz:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod defaultAppendMethod -> h
@@ -37522,8 +37885,8 @@
     162:162:com.android.tools.r8.errors.CompilationError error(com.android.tools.r8.graph.DexMethod,java.lang.String):457 -> a
     1:1:com.android.tools.r8.graph.DexMethod access$200(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$300(com.android.tools.r8.ir.desugar.StringConcatRewriter):40:40 -> c
-com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.internal.Xy:
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.internal.bz:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$1 -> com.android.tools.r8.internal.qz:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder -> com.android.tools.r8.internal.uz:
     com.android.tools.r8.ir.code.Instruction invokeCustom -> f
     java.util.ListIterator blocks -> d
     com.android.tools.r8.ir.code.BasicBlock currentBlock -> g
@@ -37542,44 +37905,36 @@
     2:3:void access$400(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Instruction):284 -> a
     4:4:void addChunk(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):314:314 -> a
     5:5:void addChunk(java.lang.String,com.android.tools.r8.graph.DexMethod):318:318 -> a
-    6:11:void desugar():339:344 -> a
-    12:12:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    12:12:void desugar():344 -> a
-    13:13:void desugar():345:345 -> a
-    14:15:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder.appendInstruction(com.android.tools.r8.ir.code.Instruction):309:310 -> a
-    14:15:void desugar():345 -> a
-    16:17:void desugar():348:349 -> a
-    18:18:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    18:18:void desugar():349 -> a
-    19:20:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder.appendInstruction(com.android.tools.r8.ir.code.Instruction):309:310 -> a
-    19:20:void desugar():348 -> a
-    21:21:void desugar():352:352 -> a
-    22:25:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
-    22:25:void desugar():353 -> a
-    26:34:void desugar():357:365 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    35:35:void desugar():365 -> a
-    36:38:void desugar():369:369 -> a
-    41:68:void desugar():372:399 -> a
+    6:12:void desugar():339:345 -> a
+    13:14:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder.appendInstruction(com.android.tools.r8.ir.code.Instruction):309:310 -> a
+    13:14:void desugar():345 -> a
+    15:16:void desugar():348:349 -> a
+    17:17:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    17:17:void desugar():349 -> a
+    18:19:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder.appendInstruction(com.android.tools.r8.ir.code.Instruction):309:310 -> a
+    18:19:void desugar():348 -> a
+    20:20:void desugar():352:352 -> a
+    21:24:void com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk.addAppendCall(com.android.tools.r8.ir.code.Value):413:413 -> a
+    21:24:void desugar():353 -> a
+    25:38:void desugar():357:370 -> a
+    39:69:void desugar():369:399 -> a
     1:1:com.android.tools.r8.ir.code.IRCode access$600(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder):284:284 -> b
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.internal.Yy:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ArgumentChunk -> com.android.tools.r8.internal.rz:
     com.android.tools.r8.ir.code.Value value -> c
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexMethod):423:424 -> <init>
     1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():429:429 -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.internal.Zy:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$Chunk -> com.android.tools.r8.internal.sz:
     com.android.tools.r8.graph.DexMethod method -> a
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> b
     1:2:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,com.android.tools.r8.graph.DexMethod):406:407 -> <init>
     com.android.tools.r8.ir.code.Value getOrCreateValue() -> a
-com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.internal.az:
+com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder$ConstantChunk -> com.android.tools.r8.internal.tz:
     com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder this$1 -> d
     java.lang.String str -> c
     1:3:void <init>(com.android.tools.r8.ir.desugar.StringConcatRewriter$ConcatBuilder,java.lang.String,com.android.tools.r8.graph.DexMethod):436:438 -> <init>
-    1:1:com.android.tools.r8.ir.code.Value getOrCreateValue():443:443 -> a
-    2:2:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    2:2:com.android.tools.r8.ir.code.Value getOrCreateValue():443 -> a
-    3:8:com.android.tools.r8.ir.code.Value getOrCreateValue():444:444 -> a
-com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.internal.VA:
+    1:6:com.android.tools.r8.ir.code.Value getOrCreateValue():443:448 -> a
+    7:7:com.android.tools.r8.ir.code.Value getOrCreateValue():444:444 -> a
+com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter -> com.android.tools.r8.internal.pB:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Set referencingClasses -> f
@@ -37705,7 +38060,7 @@
     863:863:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
     863:863:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):85 -> a
     864:880:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):86:102 -> a
-    881:881:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    881:881:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     881:881:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):101 -> a
     882:882:void rewriteMethodCode(com.android.tools.r8.ir.code.IRCode):105:105 -> a
 com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.Q1:
@@ -38793,10 +39148,10 @@
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites.rewriteToAddInstruction():27:27 -> o
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites.rewriteToArraysHashCode():21:21 -> p
     1:1:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodInvokeRewriter com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites.rewriteToInvokeMath():17:17 -> q
-com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.oq:
+com.android.tools.r8.ir.desugar.backports.NumericMethodRewrites$1 -> com.android.tools.r8.internal.Aq:
     1:1:void <init>():34:34 -> <init>
     1:1:void rewrite(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexItemFactory):39:39 -> a
-com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.Fr:
+com.android.tools.r8.ir.desugar.backports.ObjectsMethodRewrites$1 -> com.android.tools.r8.internal.Rr:
     1:1:void <init>():31:31 -> <init>
     1:5:void rewrite(com.android.tools.r8.cf.code.CfInvoke,java.util.ListIterator,com.android.tools.r8.graph.DexItemFactory):36:40 -> a
 com.android.tools.r8.ir.optimize.ArgumentRemovalUtils -> com.android.tools.r8.internal.l1:
@@ -38804,10 +39159,10 @@
     boolean com.android.tools.r8.utils.AsmUtils.isDeprecated(int) -> a
     1:1:java.lang.Object com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoBufUtilKt.getExtensionOrNull(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):12:12 -> a
     2:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.applySingleExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):13:16 -> a
-    6:6:boolean com.android.tools.r8.utils.ObjectUtils.getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):13:13 -> a
-    7:7:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
-    8:11:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
-    12:13:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
+    6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
+    7:10:java.util.Set com.android.tools.r8.utils.CollectionUtils.mergeSets(java.util.Collection,java.util.Collection):13:16 -> a
+    11:12:java.util.Deque com.android.tools.r8.utils.DequeUtils.newArrayDeque(java.lang.Object):13:14 -> a
+    13:13:boolean com.android.tools.r8.utils.ObjectUtils.getBooleanOrElse(java.lang.Object,java.util.function.Predicate,boolean):14:14 -> a
     14:14:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext) -> a
     15:75:java.lang.String[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.writeData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable):0:60 -> a
     15:75:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmWriteUtilsKt.writeProtoBufData(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):16 -> a
@@ -38827,10 +39182,10 @@
     105:120:java.lang.String com.android.tools.r8.utils.MethodReferenceUtils.toSourceStringWithoutHolderAndReturnType(com.android.tools.r8.references.MethodReference):14 -> a
     121:121:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):22:22 -> a
     122:123:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable):22:23 -> a
-    124:125:void com.android.tools.r8.utils.FunctionUtils.forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):23:24 -> a
-    126:134:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
-    135:135:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
-    136:136:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
+    124:132:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.ExtensionUtilsKt.singleOfType(java.util.Collection,com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):25:33 -> a
+    133:133:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):27:27 -> a
+    134:134:int com.android.tools.r8.jetbrains.kotlinx.metadata.FlagsKt.flagsOf(com.android.tools.r8.jetbrains.kotlinx.metadata.Flag[]):24:24 -> a
+    135:136:void com.android.tools.r8.utils.FunctionUtils.forEachApply(java.lang.Iterable,java.util.function.Function,java.lang.Object):27:28 -> a
     137:139:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Iterable,java.lang.Iterable):28:30 -> a
     140:142:java.util.Set com.android.tools.r8.utils.SetUtils.mapIdentityHashSet(java.util.Set,java.util.function.Function):45:47 -> a
     143:143:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):47:47 -> a
@@ -38853,7 +39208,8 @@
     boolean com.android.tools.r8.utils.NumberUtils.is32Bit(long) -> b
     1:2:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> b
     3:3:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(int):35:35 -> b
-    4:6:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):42:44 -> b
+    4:4:void com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.registerSynthesizedCodeReferences(com.android.tools.r8.graph.DexItemFactory):35:35 -> b
+    5:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.ProtoTypeTableUtilKt.returnType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable):42:44 -> b
 com.android.tools.r8.ir.optimize.AssertionsRewriter -> com.android.tools.r8.internal.H1:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
@@ -38883,7 +39239,7 @@
     96:96:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     97:106:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):314:323 -> a
     97:106:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    107:107:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    107:107:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     107:107:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):323 -> a
     107:107:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     108:113:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):327:332 -> a
@@ -38896,49 +39252,49 @@
     121:134:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):378:391 -> a
     121:134:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     121:134:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    135:135:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():19:19 -> a
+    135:135:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():20:20 -> a
     135:135:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):392 -> a
     135:135:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     135:135:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     136:137:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):393:394 -> a
     136:137:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     136:137:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    138:138:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():19:19 -> a
+    138:138:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():20:20 -> a
     138:138:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):396 -> a
     138:138:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     138:138:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     139:139:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):397:397 -> a
     139:139:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     139:139:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    140:140:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():19:19 -> a
+    140:140:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():20:20 -> a
     140:140:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):398 -> a
     140:140:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     140:140:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     141:143:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):399:401 -> a
     141:143:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     141:143:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    144:144:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
+    144:144:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
     144:144:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):402 -> a
     144:144:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     144:144:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    145:145:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    145:145:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     145:145:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):402 -> a
     145:145:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     145:145:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     146:146:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):406:406 -> a
     146:146:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     146:146:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    147:147:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
+    147:147:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
     147:147:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):406 -> a
     147:147:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     147:147:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    148:148:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    148:148:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     148:148:void com.android.tools.r8.ir.optimize.AssertionsRewriter.rewriteKotlinAssertionEnable(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.AssertionsConfiguration$AssertionTransformation,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):405 -> a
     148:148:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):341 -> a
     148:148:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     149:149:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343:343 -> a
     149:149:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    150:150:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    150:150:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     150:150:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):343 -> a
     150:150:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     151:155:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):346:350 -> a
@@ -38950,14 +39306,14 @@
     157:164:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     165:165:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):358:358 -> a
     165:165:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    166:166:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    166:166:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     166:166:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):357 -> a
     166:166:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     167:171:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):363:367 -> a
     167:171:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     172:172:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):365:365 -> a
     172:172:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
-    173:173:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    173:173:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     173:173:void com.android.tools.r8.ir.optimize.AssertionsRewriter.runInternal(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):364 -> a
     173:173:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):307 -> a
     174:174:void run(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):308:308 -> a
@@ -39094,10 +39450,7 @@
     257:257:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):532 -> a
     258:259:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo.isNull():693:694 -> a
     258:259:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):534 -> a
-    260:260:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):535:535 -> a
-    261:261:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    261:261:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):535 -> a
-    262:265:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):537:540 -> a
+    260:265:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):535:540 -> a
     266:266:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):536:536 -> a
     267:267:boolean com.android.tools.r8.ir.optimize.AssumeInserter$AssumedDominance.isEverything():0:0 -> a
     267:267:boolean lambda$materializeSelectedAssumeInstructions$14(java.util.function.Predicate,com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Map,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.AssumeInserter$AssumedValueInfo):541 -> a
@@ -39358,25 +39711,19 @@
     258:261:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):199 -> a
     262:270:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator.computeCallSiteOptimizationInfoFromArguments(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):293:301 -> a
     262:270:com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo lambda$propagateArgumentsToDispatchTargets$0(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Timing):199 -> a
-    271:323:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):309:361 -> a
-    324:324:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    324:324:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):361 -> a
-    325:327:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):362:364 -> a
-    328:328:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:62 -> a
-    328:328:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):365 -> a
-    329:339:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):367:377 -> a
-    340:340:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    340:340:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):377 -> a
-    341:343:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):378:380 -> a
-    344:344:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):52:52 -> a
-    344:344:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):381 -> a
-    345:367:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):382:404 -> a
-    368:368:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    368:368:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):404 -> a
-    369:369:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):404:404 -> a
-    370:394:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():410:434 -> a
-    395:404:boolean lambda$methodsToRevisit$5(com.android.tools.r8.graph.DexEncodedMethod):415:424 -> a
-    405:407:void lambda$methodsToRevisit$6(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):427:429 -> a
+    271:326:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):309:364 -> a
+    327:327:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeDynamicTypeInstruction(com.android.tools.r8.ir.analysis.type.TypeElement,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):62:62 -> a
+    327:327:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):365 -> a
+    328:341:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):367:380 -> a
+    342:342:com.android.tools.r8.ir.code.Assume com.android.tools.r8.ir.code.Assume.createAssumeNonNullInstruction(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):52:52 -> a
+    342:342:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):381 -> a
+    343:365:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):382:404 -> a
+    366:366:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    366:366:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):404 -> a
+    367:367:void applyCallSiteOptimizationInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.CallSiteOptimizationInfo):404:404 -> a
+    368:392:com.android.tools.r8.utils.collections.ProgramMethodSet methodsToRevisit():410:434 -> a
+    393:402:boolean lambda$methodsToRevisit$5(com.android.tools.r8.graph.DexEncodedMethod):415:424 -> a
+    403:405:void lambda$methodsToRevisit$6(com.android.tools.r8.utils.collections.ProgramMethodSet,com.android.tools.r8.graph.ProgramMethod):427:429 -> a
     java.util.Collection codeOptimizationsForPostProcessing() -> b
     1:1:void lambda$abandonCallSitePropagation$4(com.android.tools.r8.graph.ProgramMethod):285:285 -> b
     1:9:void logResults():78:86 -> c
@@ -39386,7 +39733,7 @@
     com.android.tools.r8.ir.optimize.CallSiteOptimizationInfoPropagator$Mode REVISIT -> b
     1:3:void <clinit>():57:59 -> <clinit>
     1:1:void <init>(java.lang.String,int):56:56 -> <init>
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.m5:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization -> com.android.tools.r8.internal.o5:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction waveDoneAction -> e
@@ -39402,7 +39749,7 @@
     100:100:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
     100:100:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):228 -> a
     101:101:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):228:228 -> a
-    102:102:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):96:96 -> a
+    102:102:void com.android.tools.r8.utils.IteratorUtils.removeIf(com.android.tools.r8.ir.code.InstructionListIterator,java.util.function.Predicate):106:106 -> a
     102:102:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):228 -> a
     103:156:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):234:287 -> a
     157:161:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):158:162 -> a
@@ -39411,7 +39758,7 @@
     187:187:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):319:319 -> a
     187:187:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):315 -> a
     187:187:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):162 -> a
-    188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    188:188:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     188:188:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.getDexStringValueForInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):319 -> a
     188:188:com.android.tools.r8.graph.DexValue com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization.getDexStringValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType):315 -> a
     188:188:void lambda$optimize$0(java.util.Set,java.util.Map,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.StaticPut):162 -> a
@@ -39463,705 +39810,710 @@
     726:733:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):478:485 -> a
     734:734:java.util.Map findFinalFieldPutsWhileCollectingUnnecessaryStaticPuts(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set):483:483 -> a
     735:737:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):528:530 -> a
-    738:738:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1227:1227 -> a
+    738:738:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
     738:738:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):530 -> a
     739:740:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):533:534 -> a
     741:741:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     741:741:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):535 -> a
     742:743:boolean isClassNameConstantOf(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Instruction):535:536 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.m5$a:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult -> com.android.tools.r8.internal.o5$a:
     java.util.Map fieldsWithStaticValues -> b
     com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult EMPTY -> a
     1:1:void <clinit>():66:66 -> <clinit>
     1:2:void <init>(java.util.Map):71:72 -> <init>
     1:1:com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult empty():76:76 -> a
     2:3:void forEachOptimizedField(java.util.function.BiConsumer):80:81 -> a
-    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    4:4:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     4:4:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):86 -> a
     5:6:boolean hasStaticValue(com.android.tools.r8.graph.DexEncodedField):87:88 -> a
-com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.n5:
+com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$WaveDoneAction -> com.android.tools.r8.internal.p5:
     java.util.Map fieldsWithStaticValues -> a
     1:1:void <init>(java.util.Map):98:98 -> <init>
     2:5:void <init>(java.util.Map):96:99 -> <init>
     1:1:void join(java.util.Map):103:103 -> a
     2:2:void execute():109:109 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.B6:
+com.android.tools.r8.ir.optimize.CodeRewriter -> com.android.tools.r8.internal.G6:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> d
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():140:140 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):159:163 -> <init>
+    1:1:void <clinit>():143:143 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):162:166 -> <init>
     boolean lambda$computeConstantArrayValues$8(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):237:237 -> a
-    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):423:446 -> a
-    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513:513 -> a
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1671:1671 -> a
-    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513 -> a
+    1:1:boolean lambda$removedTrivialGotos$0(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):240:240 -> a
+    2:25:void collapseTrivialGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,java.util.List):426:449 -> a
+    26:26:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):516:516 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveDex2OatInliningIssue():1689:1689 -> a
+    27:27:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):516 -> a
     28:29:boolean com.android.tools.r8.ir.code.IRCode.hasCatchHandlers():661:662 -> a
-    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):513 -> a
-    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):520:531 -> a
-    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():31:31 -> a
-    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):531 -> a
-    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):532:539 -> a
-    51:85:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):691:725 -> a
-    86:86:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    86:86:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):725 -> a
-    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):555:555 -> a
-    87:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):725 -> a
-    88:102:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):726:740 -> a
-    103:103:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    103:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):741 -> a
-    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):555:555 -> a
-    104:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):741 -> a
-    105:114:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):742:751 -> a
-    115:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):801:814 -> a
-    129:129:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):811:811 -> a
-    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):824:835 -> a
-    142:142:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):840:840 -> a
+    28:29:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):516 -> a
+    30:41:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):523:534 -> a
+    42:42:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():33:33 -> a
+    42:42:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):534 -> a
+    43:50:void disableDex2OatInliningForSelfRecursiveMethods(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):535:542 -> a
+    51:85:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):694:728 -> a
+    86:86:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    86:86:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):728 -> a
+    87:87:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):558:558 -> a
+    87:87:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):728 -> a
+    88:102:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):729:743 -> a
+    103:103:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    103:103:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):744 -> a
+    104:104:java.lang.Object com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder.setBlockNumber(int):558:558 -> a
+    104:104:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):744 -> a
+    105:114:void convertSwitchToSwitchAndIfs(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):745:754 -> a
+    115:128:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):804:817 -> a
+    129:129:com.android.tools.r8.ir.optimize.CodeRewriter$Interval combineOrAddInterval(java.util.List,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):814:814 -> a
+    130:141:void tryAddToBiggestSavings(java.util.Set,java.util.PriorityQueue,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,int):827:838 -> a
+    142:142:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843:843 -> a
     143:302:int com.android.tools.r8.ir.code.If.estimatedSize(com.android.tools.r8.utils.InternalOutputMode):0:159 -> a
-    143:302:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):840 -> a
-    303:310:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):840:847 -> a
-    311:311:int codeUnitMargin():854:854 -> a
-    312:352:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1013:1053 -> a
+    143:302:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843 -> a
+    303:310:int sizeForKeysWrittenAsIfs(com.android.tools.r8.ir.code.ValueType,java.util.Collection):843:850 -> a
+    311:311:int codeUnitMargin():857:857 -> a
+    312:352:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1016:1056 -> a
     353:353:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    353:353:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1053 -> a
-    354:368:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1054:1068 -> a
+    353:353:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1056 -> a
+    354:368:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1057:1071 -> a
     369:369:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    369:369:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1068 -> a
-    370:405:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1070:1105 -> a
+    369:369:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1071 -> a
+    370:405:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1073:1108 -> a
     406:406:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    406:406:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1105 -> a
-    407:407:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1107:1107 -> a
-    408:422:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):859:873 -> a
-    408:422:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
+    406:406:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
+    407:407:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1110:1110 -> a
+    408:422:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):862:876 -> a
+    408:422:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
     423:423:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    423:423:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):873 -> a
-    423:423:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
-    424:435:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):879:890 -> a
-    424:435:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
+    423:423:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):876 -> a
+    423:423:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
+    424:435:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):882:893 -> a
+    424:435:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
     436:436:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList.<init>():90:90 -> a
-    436:436:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):890 -> a
-    436:436:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
-    437:486:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):891:940 -> a
-    437:486:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
+    436:436:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):893 -> a
+    436:436:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
+    437:486:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):894:943 -> a
+    437:486:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
     487:487:boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntList.addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):564:564 -> a
-    487:487:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):941 -> a
-    487:487:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
-    488:488:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):946:946 -> a
-    488:488:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1108 -> a
-    489:497:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1112:1120 -> a
-    498:498:int lambda$rewriteIntSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):1049:1049 -> a
-    499:513:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1169:1183 -> a
-    514:532:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):466:484 -> a
-    514:532:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1184 -> a
-    533:533:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1186:1186 -> a
-    534:547:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):490:503 -> a
-    534:547:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1187 -> a
-    548:564:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1191:1207 -> a
-    565:571:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1457:1463 -> a
-    572:572:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    572:572:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1463 -> a
-    573:573:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):21:21 -> a
-    573:573:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1465 -> a
-    574:642:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1466:1534 -> a
-    643:643:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    643:643:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1535 -> a
-    644:644:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1509:1509 -> a
-    645:647:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1542:1544 -> a
-    648:648:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    648:648:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1544 -> a
-    649:651:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1544:1546 -> a
-    652:662:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1551:1561 -> a
-    663:671:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1682:1690 -> a
-    672:677:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1709:1714 -> a
-    678:678:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1777:1777 -> a
-    679:679:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    679:679:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1778 -> a
-    680:680:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1778:1778 -> a
-    681:687:void lambda$shortenLiveRanges$6(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1840:1846 -> a
-    688:691:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1874:1877 -> a
-    692:692:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    692:692:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1884 -> a
-    693:693:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    693:693:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1884 -> a
-    694:782:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1885:1973 -> a
-    783:834:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):0:51 -> a
-    783:834:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1973 -> a
-    835:836:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1974:1975 -> a
-    837:884:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2011:2058 -> a
-    885:886:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2589:2590 -> a
-    887:887:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2755:2755 -> a
-    888:888:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> a
-    888:888:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2755 -> a
-    889:890:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2755:2756 -> a
-    891:918:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2766:2793 -> a
-    919:919:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> a
-    919:919:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2797 -> a
-    920:934:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2812:2826 -> a
-    935:950:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3029:3044 -> a
-    951:951:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    951:951:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3045 -> a
-    952:956:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3046:3050 -> a
-    957:957:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
-    957:957:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3050 -> a
-    958:958:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3054:3054 -> a
-    959:961:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3065:3067 -> a
-    962:964:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> a
-    962:964:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3067 -> a
-    965:966:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3068:3069 -> a
-    967:987:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3190:3210 -> a
-    988:988:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    988:988:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3210 -> a
-    989:1005:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3210:3226 -> a
-    1006:1006:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3225:3225 -> a
-    1007:1007:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1007:1007:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3224 -> a
-    1008:1019:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3224:3235 -> a
-    1020:1042:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3246:3268 -> a
-    1043:1043:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
-    1043:1043:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3268 -> a
-    1044:1044:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3269:3269 -> a
-    1045:1079:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3306:3340 -> a
-    1045:1079:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3273 -> a
-    1080:1095:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3274:3289 -> a
-    1096:1096:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
-    1096:1096:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3291 -> a
-    1097:1101:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3292:3296 -> a
-    1102:1102:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
-    1102:1102:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3296 -> a
-    1103:1107:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3351:3355 -> a
-    1108:1108:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
-    1108:1108:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3355 -> a
-    1109:1113:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3356:3360 -> a
-    1114:1114:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3413:3413 -> a
-    1115:1119:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3419:3423 -> a
-    1115:1119:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3415 -> a
-    1120:1120:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1120:1120:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3423 -> a
-    1120:1120:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3415 -> a
-    1121:1121:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3428:3428 -> a
-    1121:1121:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3415 -> a
-    1122:1122:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3425:3425 -> a
-    1122:1122:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3415 -> a
-    1123:1123:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1123:1123:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3425 -> a
-    1123:1123:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3415 -> a
-    1124:1124:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3425:3425 -> a
-    1124:1124:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3415 -> a
-    1125:1125:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3434:3434 -> a
-    1126:1126:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1126:1126:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3435 -> a
-    1127:1127:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3437:3437 -> a
-    1128:1128:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    1128:1128:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3437 -> a
-    1129:1130:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3437:3438 -> a
-    1131:1151:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3448:3468 -> a
-    1152:1152:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1152:1152:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3467 -> a
-    1153:1159:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3470:3476 -> a
-    1160:1180:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3474:3494 -> a
-    1181:1181:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    1181:1181:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3498 -> a
-    1182:1196:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3498:3512 -> a
-    1197:1197:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    1197:1197:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3514 -> a
-    1198:1198:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3514:3514 -> a
-    1199:1202:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1435:1438 -> a
-    1199:1202:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3514 -> a
-    1203:1203:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3515:3515 -> a
-    1204:1204:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    1204:1204:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3518 -> a
-    1205:1206:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3518:3519 -> a
-    1207:1207:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    1207:1207:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3521 -> a
-    1208:1224:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3521:3537 -> a
-    1225:1225:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    1225:1225:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3537 -> a
-    1226:1229:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3538:3538 -> a
-    1232:1245:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3541:3554 -> a
-    1246:1253:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3558:3565 -> a
-    1254:1264:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3578:3588 -> a
-    1254:1264:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1265:1270:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3566:3571 -> a
-    1271:1271:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3568:3568 -> a
-    1272:1272:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1272:1272:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3568 -> a
-    1273:1273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1273:1273:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1273:1273:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3568 -> a
-    1274:1274:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3568:3568 -> a
-    1275:1275:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3586:3586 -> a
-    1275:1275:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1276:1276:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1276:1276:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3586 -> a
-    1276:1276:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1277:1277:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1277:1277:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1277:1277:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3586 -> a
-    1277:1277:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1278:1278:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3586:3586 -> a
-    1278:1278:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1279:1279:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3582:3582 -> a
-    1279:1279:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1280:1280:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
-    1280:1280:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3582 -> a
-    1280:1280:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1281:1281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
-    1281:1281:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
-    1281:1281:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3582 -> a
-    1281:1281:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1282:1282:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3582:3582 -> a
-    1282:1282:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3565 -> a
-    1283:1289:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3592:3598 -> a
+    487:487:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):944 -> a
+    487:487:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
+    488:488:int com.android.tools.r8.ir.optimize.CodeRewriter.findIfsForCandidates(java.util.List,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):949:949 -> a
+    488:488:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1111 -> a
+    489:497:void rewriteIntSwitch(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IntSwitch):1115:1123 -> a
+    498:498:int lambda$rewriteIntSwitch$1(com.android.tools.r8.utils.InternalOutputMode,com.android.tools.r8.ir.optimize.CodeRewriter$Interval,com.android.tools.r8.ir.optimize.CodeRewriter$Interval):1052:1052 -> a
+    499:513:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1172:1186 -> a
+    514:532:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseIfTrueTarget(com.android.tools.r8.ir.code.BasicBlock):469:487 -> a
+    514:532:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1187 -> a
+    533:533:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1189:1189 -> a
+    534:547:void com.android.tools.r8.ir.optimize.CodeRewriter.collapseNonFallthroughSwitchTargets(com.android.tools.r8.ir.code.BasicBlock):493:506 -> a
+    534:547:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1190 -> a
+    548:564:void collapseTrivialGotos(com.android.tools.r8.ir.code.IRCode):1194:1210 -> a
+    565:598:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1313:1346 -> a
+    599:599:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    599:599:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1346 -> a
+    600:600:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1347:1347 -> a
+    601:601:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
+    601:601:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1348 -> a
+    602:603:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1350:1351 -> a
+    604:604:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    604:604:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1352 -> a
+    605:609:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1353:1357 -> a
+    610:619:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1403:1412 -> a
+    610:619:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    620:620:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    620:620:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1412 -> a
+    620:620:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    621:621:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1414:1414 -> a
+    621:621:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    622:622:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):21:21 -> a
+    622:622:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1414 -> a
+    622:622:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    623:672:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1415:1464 -> a
+    623:672:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    673:673:java.lang.Object com.android.tools.r8.ir.code.IRCodeInstructionListIterator.previous():20:20 -> a
+    673:673:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1466 -> a
+    673:673:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    674:685:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1467:1478 -> a
+    674:685:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    686:686:com.android.tools.r8.ir.code.InvokeStatic$Builder com.android.tools.r8.ir.code.InvokeStatic.builder():50:50 -> a
+    686:686:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1480 -> a
+    686:686:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    687:690:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1481:1484 -> a
+    687:690:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    691:691:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    691:691:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1485 -> a
+    691:691:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    692:704:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1486:1498 -> a
+    692:704:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1355 -> a
+    705:709:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1364:1368 -> a
+    710:710:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> a
+    710:710:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1370 -> a
+    711:713:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1371:1373 -> a
+    714:714:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1372:1372 -> a
+    715:715:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1198:1198 -> a
+    715:715:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1385 -> a
+    716:720:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):1386:1390 -> a
+    721:727:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1507:1513 -> a
+    728:728:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    728:728:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1513 -> a
+    729:729:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):21:21 -> a
+    729:729:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1515 -> a
+    730:798:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1516:1584 -> a
+    799:799:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    799:799:boolean removeInstanceOfInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InstanceOf,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode):1585 -> a
+    800:800:boolean lambda$removeInstanceOfInstructionIfTrivial$2(com.android.tools.r8.ir.code.Value):1559:1559 -> a
+    801:803:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1592:1594 -> a
+    804:804:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    804:804:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1594 -> a
+    805:807:boolean isNeverInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexType):1594:1596 -> a
+    808:818:void removeOrReplaceByDebugLocalWrite(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):1601:1611 -> a
+    819:827:boolean isBinopWithLit8OrLit16(com.android.tools.r8.ir.code.Instruction):1732:1740 -> a
+    828:833:com.android.tools.r8.ir.code.Value binopWithLit8OrLit16NonConstant(com.android.tools.r8.ir.code.Binop):1759:1764 -> a
+    834:834:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1827:1827 -> a
+    835:835:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    835:835:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1828 -> a
+    836:836:boolean lambda$shortenLiveRanges$4(com.android.tools.r8.ir.code.ConstInstruction):1828:1828 -> a
+    837:843:void lambda$shortenLiveRanges$6(java.util.Map,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1890:1896 -> a
+    844:847:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1924:1927 -> a
+    848:848:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    848:848:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1934 -> a
+    849:849:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    849:849:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1934 -> a
+    850:938:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):1935:2023 -> a
+    939:990:com.android.tools.r8.ir.code.ConstString com.android.tools.r8.ir.code.ConstString.copyOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.ConstString):0:51 -> a
+    939:990:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2023 -> a
+    991:992:void shortenLiveRangesInsideBlock(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,java.util.Map,java.util.function.Predicate):2024:2025 -> a
+    993:1040:com.android.tools.r8.ir.code.ConstInstruction[] computeConstantArrayValues(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.BasicBlock,int):2061:2108 -> a
+    1041:1042:void simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock):2639:2640 -> a
+    1043:1043:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2805:2805 -> a
+    1044:1044:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> a
+    1044:1044:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2805 -> a
+    1045:1046:int negateBoolean(com.android.tools.r8.ir.code.ConstNumber):2805:2806 -> a
+    1047:1074:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2816:2843 -> a
+    1075:1075:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> a
+    1075:1075:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2847 -> a
+    1076:1090:boolean replaceDominatedConstNumbers(long,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,java.util.function.Supplier,com.android.tools.r8.ir.code.IRCode,java.util.function.Supplier):2862:2876 -> a
+    1091:1106:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3079:3094 -> a
+    1107:1107:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    1107:1107:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3095 -> a
+    1108:1112:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3096:3100 -> a
+    1113:1113:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> a
+    1113:1113:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3100 -> a
+    1114:1114:boolean isBlockSupportedBySimplifyKnownBooleanCondition(com.android.tools.r8.ir.code.BasicBlock):3104:3104 -> a
+    1115:1117:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3115:3117 -> a
+    1118:1120:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> a
+    1118:1120:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3117 -> a
+    1121:1122:void rewriteIfToGoto(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):3118:3119 -> a
+    1123:1143:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3240:3260 -> a
+    1144:1144:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    1144:1144:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3260 -> a
+    1145:1161:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3260:3276 -> a
+    1162:1162:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3275:3275 -> a
+    1163:1174:void rewriteAssertionErrorTwoArgumentConstructor(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.InternalOptions):3274:3285 -> a
+    1175:1197:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3296:3318 -> a
+    1198:1198:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    1198:1198:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3318 -> a
+    1199:1199:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3319:3319 -> a
+    1200:1234:java.util.Set com.android.tools.r8.ir.optimize.CodeRewriter.computeUnneededMoves(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.DebugLocalsChange,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3356:3390 -> a
+    1200:1234:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3323 -> a
+    1235:1250:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3324:3339 -> a
+    1251:1251:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalsChange():0:0 -> a
+    1251:1251:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3341 -> a
+    1252:1256:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3342:3346 -> a
+    1257:1257:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap):168:168 -> a
+    1257:1257:void removeUnneededMovesOnExitingPaths(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):3346 -> a
+    1258:1262:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3401:3405 -> a
+    1263:1263:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):167:167 -> a
+    1263:1263:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3405 -> a
+    1264:1268:void updateDebugLocalsRegisterMap(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap):3406:3410 -> a
+    1269:1269:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3463:3463 -> a
+    1270:1274:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3469:3473 -> a
+    1270:1274:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3465 -> a
+    1275:1275:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1275:1275:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3473 -> a
+    1275:1275:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3465 -> a
+    1276:1276:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3478:3478 -> a
+    1276:1276:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3465 -> a
+    1277:1277:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3475:3475 -> a
+    1277:1277:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3465 -> a
+    1278:1278:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1278:1278:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3475 -> a
+    1278:1278:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3465 -> a
+    1279:1279:boolean com.android.tools.r8.ir.optimize.CodeRewriter.isSubtypeOfThrowable(com.android.tools.r8.graph.DexType):3475:3475 -> a
+    1279:1279:boolean matchesMethodOfThrowable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):3465 -> a
+    1280:1283:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3484:3487 -> a
+    1284:1284:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    1284:1284:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3487 -> a
+    1285:1286:com.android.tools.r8.ir.code.Value addConstString(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.lang.String):3487:3488 -> a
+    1287:1307:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3498:3518 -> a
+    1308:1317:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3517:3526 -> a
+    1318:1338:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3524:3544 -> a
+    1339:1339:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    1339:1339:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3548 -> a
+    1340:1354:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3548:3562 -> a
+    1355:1355:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    1355:1355:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3564 -> a
+    1356:1356:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3564:3564 -> a
+    1357:1360:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1437:1440 -> a
+    1357:1360:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3564 -> a
+    1361:1361:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3565:3565 -> a
+    1362:1362:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    1362:1362:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3568 -> a
+    1363:1364:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3568:3569 -> a
+    1365:1365:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    1365:1365:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3571 -> a
+    1366:1385:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3571:3590 -> a
+    1386:1402:void logArgumentTypes(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):3588:3604 -> a
+    1403:1410:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3608:3615 -> a
+    1411:1421:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3628:3638 -> a
+    1411:1421:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1422:1427:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3616:3621 -> a
+    1428:1428:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3618:3618 -> a
+    1429:1429:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1429:1429:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3618 -> a
+    1430:1430:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1430:1430:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1430:1430:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3618 -> a
+    1431:1431:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3618:3618 -> a
+    1432:1432:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3636:3636 -> a
+    1432:1432:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1433:1433:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1433:1433:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3636 -> a
+    1433:1433:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1434:1434:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1434:1434:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1434:1434:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3636 -> a
+    1434:1434:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1435:1435:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3636:3636 -> a
+    1435:1435:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1436:1436:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3632:3632 -> a
+    1436:1436:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1437:1437:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
+    1437:1437:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3632 -> a
+    1437:1437:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1438:1438:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> a
+    1438:1438:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22 -> a
+    1438:1438:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3632 -> a
+    1438:1438:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1439:1439:com.android.tools.r8.ir.code.NewInstance com.android.tools.r8.ir.optimize.CodeRewriter.findNewInstance(com.android.tools.r8.ir.code.Phi):3632:3632 -> a
+    1439:1439:void ensureDirectStringNewToInit(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexItemFactory):3615 -> a
+    1440:1446:void recursiveAddOperands(com.android.tools.r8.ir.code.Phi,java.util.Set,java.util.Set):3642:3648 -> a
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> b
-    1:1:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1786 -> b
-    2:2:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1786:1786 -> b
-    3:3:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):176:176 -> b
+    1:1:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1836 -> b
+    2:2:boolean lambda$shortenLiveRanges$5(com.android.tools.r8.ir.code.ConstInstruction):1836:1836 -> b
+    3:3:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):179:179 -> b
     4:1028:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():0:1024 -> b
-    4:1028:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):178 -> b
-    1029:1030:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):180:181 -> b
+    4:1028:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):181 -> b
+    1029:1030:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):183:184 -> b
     1031:1031:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> b
-    1031:1031:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):192 -> b
-    1032:1041:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):193:202 -> b
-    1042:1042:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1201:1201 -> b
-    1042:1042:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):214 -> b
-    1043:1044:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):217:218 -> b
+    1031:1031:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):195 -> b
+    1032:1041:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):196:205 -> b
+    1042:1042:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1198:1198 -> b
+    1042:1042:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):217 -> b
+    1043:1044:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):220:221 -> b
     1045:1045:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
-    1045:1045:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):218 -> b
-    1046:1049:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):218:221 -> b
-    1050:1051:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):411:412 -> b
-    1052:1061:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):451:460 -> b
-    1062:1063:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2352:2353 -> b
+    1045:1045:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):221 -> b
+    1046:1049:void removeAssumeInstructions(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):221:224 -> b
+    1050:1051:boolean isFallthroughBlock(com.android.tools.r8.ir.code.BasicBlock):414:415 -> b
+    1052:1061:void unlinkTrivialGotoBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock):454:463 -> b
+    1062:1063:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2402:2403 -> b
     1064:1064:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> b
-    1064:1064:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2354 -> b
+    1064:1064:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2404 -> b
     1065:1065:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> b
-    1065:1065:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2355 -> b
-    1066:1067:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2356:2357 -> b
-    1068:1068:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2373:2373 -> b
-    1069:1075:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2361:2367 -> b
-    1069:1075:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2374 -> b
-    1076:1078:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2376:2378 -> b
+    1065:1065:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2405 -> b
+    1066:1067:boolean isCSEInstructionCandidate(com.android.tools.r8.ir.code.Instruction):2406:2407 -> b
+    1068:1068:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2423:2423 -> b
+    1069:1075:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasCSECandidate(com.android.tools.r8.ir.code.IRCode,int):2411:2417 -> b
+    1069:1075:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2424 -> b
+    1076:1078:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2426:2428 -> b
     1079:1079:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> b
-    1079:1079:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2378 -> b
-    1080:1093:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2379:2392 -> b
-    1094:1103:boolean com.android.tools.r8.ir.optimize.CodeRewriter.shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2339:2348 -> b
-    1094:1103:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2393 -> b
-    1104:1120:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2394:2410 -> b
-    1121:1147:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3611:3637 -> b
-    1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):1969:1969 -> c
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2627:2627 -> c
+    1079:1079:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2428 -> b
+    1080:1093:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2429:2442 -> b
+    1094:1103:boolean com.android.tools.r8.ir.optimize.CodeRewriter.shareCatchHandlers(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2389:2398 -> b
+    1094:1103:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2443 -> b
+    1104:1120:void commonSubexpressionElimination(com.android.tools.r8.ir.code.IRCode):2444:2460 -> b
+    1121:1147:void replaceTrivialNewInstancePhis(com.android.tools.r8.ir.code.Value):3661:3687 -> b
+    1:1:java.util.Map lambda$shortenLiveRangesInsideBlock$7(com.android.tools.r8.ir.code.BasicBlock):2019:2019 -> c
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2677:2677 -> c
     3:3:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> c
-    3:3:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2627 -> c
-    4:4:boolean lambda$logArgumentTypes$11(com.android.tools.r8.ir.code.Instruction):3457:3457 -> c
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap com.android.tools.r8.ir.optimize.CodeRewriter.getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2731:2731 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2626 -> d
+    3:3:com.android.tools.r8.ir.code.DominatorTree lambda$redundantConstNumberRemoval$10(com.android.tools.r8.ir.code.IRCode):2677 -> c
+    4:4:boolean lambda$logArgumentTypes$11(com.android.tools.r8.ir.code.Instruction):3507:3507 -> c
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap com.android.tools.r8.ir.optimize.CodeRewriter.getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2781:2781 -> d
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2676 -> d
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.<init>():119:119 -> d
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap com.android.tools.r8.ir.optimize.CodeRewriter.getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2731 -> d
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2626 -> d
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap com.android.tools.r8.ir.optimize.CodeRewriter.getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2734:2747 -> d
-    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2626 -> d
-    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1765:1765 -> e
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap com.android.tools.r8.ir.optimize.CodeRewriter.getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2781 -> d
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2676 -> d
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap com.android.tools.r8.ir.optimize.CodeRewriter.getConstantsByValue(com.android.tools.r8.ir.code.IRCode):2784:2797 -> d
+    3:16:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap lambda$redundantConstNumberRemoval$9(com.android.tools.r8.ir.code.IRCode):2676 -> d
+    1:1:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1815:1815 -> e
     2:2:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> e
-    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1765 -> e
-    1:59:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2836:2894 -> f
+    2:2:com.android.tools.r8.ir.code.DominatorTree lambda$shortenLiveRanges$3(com.android.tools.r8.ir.code.IRCode):1815 -> e
+    1:59:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2886:2944 -> f
     60:60:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo.hasNonNullParamOrThrow():48:48 -> f
-    60:60:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2898 -> f
-    61:84:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2899:2922 -> f
+    60:60:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2948 -> f
+    61:84:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2949:2972 -> f
     85:85:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> f
-    85:85:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2922 -> f
-    86:88:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2922:2924 -> f
-    1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2615:2665 -> g
+    85:85:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2972 -> f
+    86:88:void optimizeAlwaysThrowingInstructions(com.android.tools.r8.ir.code.IRCode):2972:2974 -> f
+    1:51:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2665:2715 -> g
     52:52:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> g
-    52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2666 -> g
-    53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2668:2677 -> g
-    63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2676:2676 -> g
+    52:52:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2716 -> g
+    53:62:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2718:2727 -> g
+    63:63:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2726:2726 -> g
     64:64:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> g
-    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2683 -> g
-    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2686:2686 -> g
-    66:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2685:2698 -> g
-    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2697:2697 -> g
+    64:64:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2733 -> g
+    65:65:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2736:2736 -> g
+    66:79:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2735:2748 -> g
+    80:80:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2747:2747 -> g
     81:81:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> g
-    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2704 -> g
-    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2707:2707 -> g
-    83:102:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2706:2725 -> g
-    1:34:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1306:1339 -> h
-    35:35:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> h
-    35:35:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1339 -> h
-    36:36:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1340:1340 -> h
-    37:37:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> h
-    37:37:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1341 -> h
-    38:39:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1343:1344 -> h
-    40:40:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> h
-    40:40:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1345 -> h
-    41:44:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1346:1349 -> h
-    45:54:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1386:1395 -> h
-    45:54:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1348 -> h
-    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> h
-    55:55:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1395 -> h
-    55:55:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1348 -> h
-    56:56:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1397:1397 -> h
-    56:56:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1348 -> h
-    57:57:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isClassAccessible(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):21:21 -> h
-    57:57:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1397 -> h
-    57:57:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1348 -> h
-    58:108:com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult com.android.tools.r8.ir.optimize.CodeRewriter.removeCheckCastInstructionIfTrivial(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.IRCode,java.util.Set):1398:1448 -> h
-    58:108:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1348 -> h
-    109:113:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1350:1354 -> h
-    114:114:boolean com.android.tools.r8.ir.code.Instruction.isInstanceOf():0:0 -> h
-    114:114:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1356 -> h
-    115:117:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1357:1359 -> h
-    118:118:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1358:1358 -> h
-    119:119:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1201:1201 -> h
-    119:119:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1371 -> h
-    120:124:void removeTrivialCheckCastAndInstanceOfInstructions(com.android.tools.r8.ir.code.IRCode):1372:1376 -> h
-    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):225:237 -> i
-    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):234:240 -> i
-    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> j
-    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3155 -> j
-    2:3:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3156:3157 -> j
-    4:4:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> j
-    4:4:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3158 -> j
-    5:16:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3162:3173 -> j
-    17:17:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> j
-    17:17:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3175 -> j
-    18:20:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3176:3178 -> j
-    21:21:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> j
-    21:21:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3179 -> j
-    22:22:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3180:3180 -> j
-    23:23:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> j
-    23:23:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3181 -> j
-    24:24:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction) -> j
-    24:24:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3182 -> j
-    25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3186:3186 -> j
-    1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1233:1233 -> k
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> k
-    2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1233 -> k
-    3:34:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1233:1264 -> k
-    35:35:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1213:1213 -> k
-    35:35:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1266 -> k
-    36:42:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.CodeRewriter.getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1222:1228 -> k
-    36:42:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1215 -> k
-    36:42:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1266 -> k
-    43:46:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1215:1218 -> k
-    43:46:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1266 -> k
-    47:67:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1267:1287 -> k
-    68:68:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1201:1201 -> k
-    68:68:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1288 -> k
-    69:70:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1289:1290 -> k
-    71:71:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1201:1201 -> k
-    71:71:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1291 -> k
-    72:73:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1293:1294 -> k
-    74:74:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> k
-    74:74:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1294 -> k
-    75:77:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1294:1296 -> k
-    1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):951:951 -> l
-    2:15:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):955:968 -> l
-    2:15:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):951 -> l
-    16:44:com.android.tools.r8.ir.optimize.SwitchCaseEliminator com.android.tools.r8.ir.optimize.CodeRewriter.removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1130:1158 -> l
-    16:44:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):970 -> l
-    16:44:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):951 -> l
-    45:74:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):972:1001 -> l
-    45:74:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):951 -> l
-    75:75:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> l
-    75:75:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1001 -> l
-    75:75:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):951 -> l
-    76:79:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1001:1004 -> l
-    76:79:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):951 -> l
-    1:34:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):249:282 -> m
-    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():782:782 -> m
-    35:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):284 -> m
-    36:44:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):286:294 -> m
-    45:45:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):43:43 -> m
-    45:45:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):294 -> m
-    46:92:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):298:344 -> m
-    93:117:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3080:3104 -> m
-    93:117:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):337 -> m
-    118:172:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):350:404 -> m
-    173:173:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> m
-    173:173:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):404 -> m
-    174:177:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):404:407 -> m
-    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3370:3386 -> n
-    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> n
-    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3393 -> n
-    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3394:3409 -> n
-    1:43:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1764:1806 -> o
-    44:44:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> o
-    44:44:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1807 -> o
-    45:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1808:1817 -> o
-    55:55:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():31:31 -> o
-    55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1817 -> o
-    56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> o
-    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1818 -> o
-    57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1819:1833 -> o
-    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1632:1632 -> o
-    72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1834 -> o
-    73:73:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> o
-    73:73:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1834 -> o
-    74:74:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1837:1837 -> o
-    75:76:void com.android.tools.r8.ir.optimize.CodeRewriter.forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1864:1865 -> o
-    75:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1837 -> o
-    77:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1851:1860 -> o
-    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2088:2088 -> p
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> p
-    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2088 -> p
-    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2091:2099 -> p
-    12:28:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2064:2080 -> p
-    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2100 -> p
-    29:60:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2103:2134 -> p
-    61:77:short[] com.android.tools.r8.ir.optimize.CodeRewriter.computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):1984:2000 -> p
-    61:77:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2135 -> p
-    78:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2139:2185 -> p
-    1:5:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2222:2226 -> q
-    6:6:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> q
-    6:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2227 -> q
-    7:12:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2228:2233 -> q
-    13:35:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2191:2213 -> q
-    13:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2235 -> q
-    36:48:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2236:2248 -> q
-    49:49:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2218:2218 -> q
-    49:49:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2235 -> q
-    1:6:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2420:2425 -> r
-    7:21:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3134:3148 -> r
-    7:21:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2426 -> r
-    22:24:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> r
-    22:24:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3149 -> r
-    22:24:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2426 -> r
-    25:25:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3150:3150 -> r
-    25:25:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2426 -> r
-    26:37:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3108:3119 -> r
-    26:37:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    38:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> r
-    38:51:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3119 -> r
-    38:51:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> r
-    52:52:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3119 -> r
-    52:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> r
-    53:53:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3119 -> r
-    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> r
-    54:54:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3119 -> r
-    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    55:55:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> r
-    55:55:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3119 -> r
-    55:55:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    56:56:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3119:3119 -> r
-    56:56:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    57:59:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> r
-    57:59:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3120 -> r
-    57:59:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    60:64:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3121:3125 -> r
-    60:64:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    65:67:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> r
-    65:67:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3126 -> r
-    65:67:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    68:68:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3127:3127 -> r
-    68:68:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2427 -> r
-    69:71:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2958:2960 -> r
-    69:71:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2429 -> r
-    72:72:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> r
-    72:72:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2960 -> r
-    72:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2429 -> r
-    73:107:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2961:2995 -> r
-    73:107:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2429 -> r
-    108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> r
-    108:108:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2996 -> r
-    108:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2429 -> r
-    109:130:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):2998:3019 -> r
-    109:130:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2429 -> r
-    131:154:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2434:2457 -> r
-    155:155:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    155:155:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2458 -> r
-    156:170:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2461:2475 -> r
-    171:171:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    171:171:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> r
-    172:172:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2467:2467 -> r
-    173:173:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    173:173:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2468 -> r
-    174:184:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2483:2493 -> r
-    185:185:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    185:185:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2494 -> r
-    186:201:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2497:2512 -> r
-    202:202:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    202:202:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2513 -> r
-    203:203:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2503:2503 -> r
-    204:204:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    204:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2504 -> r
-    205:209:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2523:2527 -> r
-    210:210:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    210:210:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2528 -> r
-    211:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2530:2530 -> r
-    212:212:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2531 -> r
-    213:214:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2536:2537 -> r
-    215:215:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> r
-    215:215:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2538 -> r
-    216:216:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2539:2539 -> r
-    217:217:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> r
-    217:217:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2540 -> r
-    218:226:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2542:2550 -> r
-    227:227:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2549:2549 -> r
-    228:228:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    228:228:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2545 -> r
-    229:234:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2552:2557 -> r
-    235:235:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    235:235:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2558 -> r
-    236:236:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2560:2560 -> r
-    237:326:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> r
-    237:326:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2560 -> r
-    327:327:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> r
-    327:327:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> r
-    327:327:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2560 -> r
-    328:328:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2561:2561 -> r
-    329:329:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():162:162 -> r
-    329:329:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2562 -> r
-    330:331:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2563:2564 -> r
-    332:421:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> r
-    332:421:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2564 -> r
-    422:422:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> r
-    422:422:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> r
-    422:422:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2564 -> r
-    423:423:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2566:2566 -> r
-    424:424:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():162:162 -> r
-    424:424:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2567 -> r
-    425:425:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2594:2594 -> r
-    425:425:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2568 -> r
-    426:428:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2578:2580 -> r
-    429:429:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> r
-    429:429:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2580 -> r
-    430:433:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2580:2583 -> r
-    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1569:1598 -> s
-    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1609:1639 -> t
-    32:32:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> t
-    32:32:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1639 -> t
-    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1639:1657 -> t
-    52:65:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1725:1738 -> t
-    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> t
-    66:66:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):449:449 -> t
-    66:66:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1738 -> t
-    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> t
-    67:67:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1739:1739 -> t
-    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> t
-    68:68:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> t
-    68:68:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1739 -> t
-    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> t
-    69:76:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1740:1747 -> t
-    69:76:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> t
-    77:2013:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):0:1936 -> t
-    77:2013:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1750 -> t
-    77:2013:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> t
-    2014:2014:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1753:1753 -> t
-    2014:2014:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1658 -> t
-    2015:2020:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1696:1701 -> t
-    2015:2020:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1660 -> t
-    2021:2031:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1661:1671 -> t
-    2032:2032:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1703:1703 -> t
-    2032:2032:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1660 -> t
-    2033:2033:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1677:1677 -> t
-    1:7:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3644:3650 -> u
-    8:8:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> u
-    8:8:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3650 -> u
-    9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3651:3683 -> u
-com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.B6$a:
-com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.B6$b:
+    81:81:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2754 -> g
+    82:82:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2757:2757 -> g
+    83:102:void redundantConstNumberRemoval(com.android.tools.r8.ir.code.IRCode):2756:2775 -> g
+    1:13:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):228:240 -> h
+    14:20:boolean removedTrivialGotos(com.android.tools.r8.ir.code.IRCode):237:243 -> h
+    1:1:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> i
+    1:1:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3205 -> i
+    2:3:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3206:3207 -> i
+    4:4:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> i
+    4:4:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3208 -> i
+    5:16:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3212:3223 -> i
+    17:17:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> i
+    17:17:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3225 -> i
+    18:20:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3226:3228 -> i
+    21:21:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayFilledData():0:0 -> i
+    21:21:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3229 -> i
+    22:22:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3230:3230 -> i
+    23:23:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> i
+    23:23:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3231 -> i
+    24:24:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> i
+    24:24:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3232 -> i
+    25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3236:3236 -> i
+    1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1236:1236 -> j
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> j
+    2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1236 -> j
+    3:34:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1236:1267 -> j
+    35:35:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1216:1216 -> j
+    35:35:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269 -> j
+    36:42:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.CodeRewriter.getArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1225:1231 -> j
+    36:42:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1218 -> j
+    36:42:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269 -> j
+    43:46:boolean com.android.tools.r8.ir.optimize.CodeRewriter.checkArgumentType(com.android.tools.r8.ir.code.InvokeMethod,int):1218:1221 -> j
+    43:46:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1269 -> j
+    47:67:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1270:1290 -> j
+    68:68:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1198:1198 -> j
+    68:68:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1291 -> j
+    69:70:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1292:1293 -> j
+    71:71:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1198:1198 -> j
+    71:71:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1294 -> j
+    72:73:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1296:1297 -> j
+    74:74:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> j
+    74:74:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1297 -> j
+    75:77:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1297:1299 -> j
+    1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954:954 -> k
+    2:15:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):958:971 -> k
+    2:15:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
+    16:44:com.android.tools.r8.ir.optimize.SwitchCaseEliminator com.android.tools.r8.ir.optimize.CodeRewriter.removeUnnecessarySwitchCases(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Switch,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1133:1161 -> k
+    16:44:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):973 -> k
+    16:44:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
+    45:74:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):975:1004 -> k
+    45:74:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
+    75:75:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> k
+    75:75:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1004 -> k
+    75:75:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
+    76:79:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):1004:1007 -> k
+    76:79:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):954 -> k
+    1:34:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):252:285 -> l
+    35:35:boolean com.android.tools.r8.ir.code.Value.isConstZero():782:782 -> l
+    35:35:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):287 -> l
+    36:44:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):289:297 -> l
+    45:45:com.android.tools.r8.ir.code.InvokeDirect com.android.tools.r8.ir.code.NewInstance.getUniqueConstructorInvoke(com.android.tools.r8.graph.DexItemFactory):43:43 -> l
+    45:45:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):297 -> l
+    46:92:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):301:347 -> l
+    93:117:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfToRequireNonNull(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Position):3130:3154 -> l
+    93:117:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):340 -> l
+    118:172:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):353:407 -> l
+    173:173:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> l
+    173:173:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):407 -> l
+    174:177:void rewriteThrowNullPointerException(com.android.tools.r8.ir.code.IRCode):407:410 -> l
+    1:17:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3420:3436 -> m
+    18:18:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> m
+    18:18:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3443 -> m
+    19:34:void rewriteThrowableAddAndGetSuppressed(com.android.tools.r8.ir.code.IRCode):3444:3459 -> m
+    1:43:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1814:1856 -> n
+    44:44:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> n
+    44:44:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1857 -> n
+    45:54:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1858:1867 -> n
+    55:55:java.lang.Object com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.previous():33:33 -> n
+    55:55:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1867 -> n
+    56:56:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> n
+    56:56:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1868 -> n
+    57:71:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1869:1883 -> n
+    72:72:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpIfFloatBug():1650:1650 -> n
+    72:72:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1884 -> n
+    73:73:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> n
+    73:73:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1884 -> n
+    74:74:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1887:1887 -> n
+    75:76:void com.android.tools.r8.ir.optimize.CodeRewriter.forEachUse(com.android.tools.r8.ir.code.Instruction,java.util.function.Consumer):1914:1915 -> n
+    75:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1887 -> n
+    77:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1901:1910 -> n
+    1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2138:2138 -> o
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> o
+    2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2138 -> o
+    3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2141:2149 -> o
+    12:28:boolean com.android.tools.r8.ir.optimize.CodeRewriter.allowNewFilledArrayConstruction(com.android.tools.r8.ir.code.Instruction):2114:2130 -> o
+    12:28:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2150 -> o
+    29:60:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2153:2184 -> o
+    61:77:short[] com.android.tools.r8.ir.optimize.CodeRewriter.computeArrayFilledData(com.android.tools.r8.ir.code.ConstInstruction[],int,int):2034:2050 -> o
+    61:77:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2185 -> o
+    78:124:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2189:2235 -> o
+    1:5:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2272:2276 -> p
+    6:6:boolean com.android.tools.r8.ir.code.Instruction.isDebugLocalWrite():0:0 -> p
+    6:6:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2277 -> p
+    7:12:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2278:2283 -> p
+    13:35:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2241:2263 -> p
+    13:35:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2285 -> p
+    36:48:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2286:2298 -> p
+    49:49:boolean com.android.tools.r8.ir.optimize.CodeRewriter.hasLocalOrLineChangeBetween(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):2268:2268 -> p
+    49:49:void simplifyDebugLocals(com.android.tools.r8.ir.code.IRCode):2285 -> p
+    1:6:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2470:2475 -> q
+    7:21:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3184:3198 -> q
+    7:21:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> q
+    22:24:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> q
+    22:24:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3199 -> q
+    22:24:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> q
+    25:25:boolean com.android.tools.r8.ir.optimize.CodeRewriter.flipIfBranchesIfNeeded(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3200:3200 -> q
+    25:25:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2476 -> q
+    26:37:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3158:3169 -> q
+    26:37:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    38:51:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():27:40 -> q
+    38:51:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3169 -> q
+    38:51:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    52:52:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():38:38 -> q
+    52:52:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3169 -> q
+    52:52:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    53:53:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():36:36 -> q
+    53:53:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3169 -> q
+    53:53:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    54:54:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():34:34 -> q
+    54:54:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3169 -> q
+    54:54:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    55:55:com.android.tools.r8.ir.code.If$Type com.android.tools.r8.ir.code.If$Type.forSwappedOperands():32:32 -> q
+    55:55:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3169 -> q
+    55:55:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    56:56:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3169:3169 -> q
+    56:56:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    57:59:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> q
+    57:59:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3170 -> q
+    57:59:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    60:64:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3171:3175 -> q
+    60:64:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    65:67:void com.android.tools.r8.ir.code.BasicBlock.replaceLastInstruction(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):100:102 -> q
+    65:67:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3176 -> q
+    65:67:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    68:68:void com.android.tools.r8.ir.optimize.CodeRewriter.rewriteIfWithConstZero(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3177:3177 -> q
+    68:68:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2477 -> q
+    69:71:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3008:3010 -> q
+    69:71:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2479 -> q
+    72:72:boolean com.android.tools.r8.ir.code.Value.knownToBeBoolean():869:869 -> q
+    72:72:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3010 -> q
+    72:72:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2479 -> q
+    73:107:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3011:3045 -> q
+    73:107:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2479 -> q
+    108:108:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> q
+    108:108:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3046 -> q
+    108:108:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2479 -> q
+    109:130:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyKnownBooleanCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock):3048:3069 -> q
+    109:130:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2479 -> q
+    131:154:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2484:2507 -> q
+    155:155:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    155:155:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2508 -> q
+    156:170:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2511:2525 -> q
+    171:171:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    171:171:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2526 -> q
+    172:172:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2517:2517 -> q
+    173:173:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    173:173:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2518 -> q
+    174:184:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2533:2543 -> q
+    185:185:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    185:185:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2544 -> q
+    186:201:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2547:2562 -> q
+    202:202:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    202:202:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2563 -> q
+    203:203:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2553:2553 -> q
+    204:204:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    204:204:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2554 -> q
+    205:209:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2573:2577 -> q
+    210:210:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    210:210:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2578 -> q
+    211:211:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2580:2580 -> q
+    212:212:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    212:212:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2581 -> q
+    213:214:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2586:2587 -> q
+    215:215:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> q
+    215:215:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2588 -> q
+    216:216:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2589:2589 -> q
+    217:217:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleConstClassValue():0:0 -> q
+    217:217:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2590 -> q
+    218:226:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2592:2600 -> q
+    227:227:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2599:2599 -> q
+    228:228:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    228:228:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2595 -> q
+    229:234:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2602:2607 -> q
+    235:235:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    235:235:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2608 -> q
+    236:236:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2610:2610 -> q
+    237:326:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> q
+    237:326:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2610 -> q
+    327:327:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> q
+    327:327:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> q
+    327:327:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2610 -> q
+    328:328:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2611:2611 -> q
+    329:329:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():163:163 -> q
+    329:329:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2612 -> q
+    330:331:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2613:2614 -> q
+    332:421:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> q
+    332:421:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2614 -> q
+    422:422:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> q
+    422:422:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> q
+    422:422:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2614 -> q
+    423:423:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2616:2616 -> q
+    424:424:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():163:163 -> q
+    424:424:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2617 -> q
+    425:425:void com.android.tools.r8.ir.optimize.CodeRewriter.simplifyIfWithKnownCondition(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.If,int):2644:2644 -> q
+    425:425:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2618 -> q
+    426:428:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2628:2630 -> q
+    429:429:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> q
+    429:429:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2630 -> q
+    430:433:boolean simplifyIf(com.android.tools.r8.ir.code.IRCode):2630:2633 -> q
+    1:30:void splitRangeInvokeConstants(com.android.tools.r8.ir.code.IRCode):1619:1648 -> r
+    1:31:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1659:1689 -> s
+    32:32:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> s
+    32:32:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1689 -> s
+    33:51:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1689:1707 -> s
+    52:65:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1775:1788 -> s
+    52:65:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> s
+    66:66:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable,java.lang.Iterable):449:449 -> s
+    66:66:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1788 -> s
+    66:66:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> s
+    67:67:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1789:1789 -> s
+    67:67:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> s
+    68:68:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> s
+    68:68:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1789 -> s
+    68:68:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> s
+    69:76:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1790:1797 -> s
+    69:76:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> s
+    77:2015:boolean com.android.tools.r8.ir.code.BasicBlock.hasPathTo(com.android.tools.r8.ir.code.BasicBlock):0:1938 -> s
+    77:2015:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1800 -> s
+    77:2015:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> s
+    2016:2016:boolean com.android.tools.r8.ir.optimize.CodeRewriter.canBe2AddrInstruction(com.android.tools.r8.ir.code.Binop,int,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1803:1803 -> s
+    2016:2016:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1708 -> s
+    2017:2022:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1746:1751 -> s
+    2017:2022:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1710 -> s
+    2023:2033:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1711:1721 -> s
+    2034:2034:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.CodeRewriter.binopWithLit8OrLit16Constant(com.android.tools.r8.ir.code.Instruction):1753:1753 -> s
+    2034:2034:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1710 -> s
+    2035:2035:void useDedicatedConstantForLitInstruction(com.android.tools.r8.ir.code.IRCode):1727:1727 -> s
+    1:7:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3694:3700 -> t
+    8:8:boolean com.android.tools.r8.ir.code.Instruction.isNeg():0:0 -> t
+    8:8:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3700 -> t
+    9:41:void workaroundNumberConversionRegisterAllocationBug(com.android.tools.r8.ir.code.IRCode):3701:3733 -> t
+com.android.tools.r8.ir.optimize.CodeRewriter$1 -> com.android.tools.r8.internal.G6$a:
+com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence -> com.android.tools.r8.internal.G6$b:
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():2255:2255 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2255:2255 -> <init>
-    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2259:2260 -> <init>
-    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2255:2255 -> a
+    1:1:void <clinit>():2305:2305 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.optimize.CodeRewriter$1):2305:2305 -> <init>
+    2:3:void <init>(com.android.tools.r8.utils.InternalOptions):2309:2310 -> <init>
+    1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):2305:2305 -> a
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> a
-    2:2:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2268 -> a
-    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2255 -> a
-    3:3:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2268:2268 -> a
-    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2255 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1604:1604 -> a
-    4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2268 -> a
-    4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):2255 -> a
-    5:20:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2272:2287 -> a
-    5:20:boolean doEquivalent(java.lang.Object,java.lang.Object):2255 -> a
-    21:21:int doHash(java.lang.Object):2255:2255 -> a
-    22:36:int com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):2298:2312 -> a
-    22:36:int doHash(java.lang.Object):2255 -> a
-    37:42:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2319:2324 -> a
-    43:47:int getHashCode(com.android.tools.r8.ir.code.Value):2330:2334 -> a
-com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.B6$c:
+    2:2:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2318 -> a
+    2:2:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    3:3:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2318:2318 -> a
+    3:3:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1622:1622 -> a
+    4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2318 -> a
+    4:4:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    5:20:boolean com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):2322:2337 -> a
+    5:20:boolean doEquivalent(java.lang.Object,java.lang.Object):2305 -> a
+    21:21:int doHash(java.lang.Object):2305:2305 -> a
+    22:36:int com.android.tools.r8.ir.optimize.CodeRewriter$CSEExpressionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):2348:2362 -> a
+    22:36:int doHash(java.lang.Object):2305 -> a
+    37:42:boolean identicalValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):2369:2374 -> a
+    43:47:int getHashCode(com.android.tools.r8.ir.code.Value):2380:2384 -> a
+com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder -> com.android.tools.r8.internal.G6$c:
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> h
     com.android.tools.r8.ir.code.BasicBlock target -> g
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.Value left -> e
     int right -> f
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():620:620 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):628:629 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):638:638 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):643:643 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):653:653 -> a
-    4:9:com.android.tools.r8.ir.code.BasicBlock build():658:663 -> a
-    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
-    10:10:com.android.tools.r8.ir.code.BasicBlock build():663 -> a
-    11:16:com.android.tools.r8.ir.code.BasicBlock build():664:669 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1435:1438 -> a
-    17:20:com.android.tools.r8.ir.code.BasicBlock build():669 -> a
-    21:23:com.android.tools.r8.ir.code.BasicBlock build():671:673 -> a
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):648:648 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.internal.B6$d:
+    1:1:void <clinit>():623:623 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.code.Position,com.android.tools.r8.ir.code.IRCode):631:632 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setLeft(com.android.tools.r8.ir.code.Value):641:641 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setRight(int):646:646 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):656:656 -> a
+    4:9:com.android.tools.r8.ir.code.BasicBlock build():661:666 -> a
+    10:10:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
+    10:10:com.android.tools.r8.ir.code.BasicBlock build():666 -> a
+    11:16:com.android.tools.r8.ir.code.BasicBlock build():667:672 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createIfBlock(int,com.android.tools.r8.ir.code.If,com.android.tools.r8.ir.code.IRMetadata):1437:1440 -> a
+    17:20:com.android.tools.r8.ir.code.BasicBlock build():672 -> a
+    21:23:com.android.tools.r8.ir.code.BasicBlock build():674:676 -> a
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$IfBuilder setTarget(com.android.tools.r8.ir.code.BasicBlock):651:651 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult -> com.android.tools.r8.internal.G6$d:
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult FALSE -> c
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult TRUE -> b
     com.android.tools.r8.ir.optimize.CodeRewriter$InstanceOfResult UNKNOWN -> a
-    1:3:void <clinit>():143:145 -> <clinit>
-    1:1:void <init>(java.lang.String,int):142:142 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.B6$e:
+    1:3:void <clinit>():146:148 -> <clinit>
+    1:1:void <init>(java.lang.String,int):145:145 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$InstructionBuilder -> com.android.tools.r8.internal.G6$e:
     com.android.tools.r8.ir.code.Position position -> b
     int blockNumber -> a
-    1:2:void <init>(com.android.tools.r8.ir.code.Position):548:549 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.B6$f:
+    1:2:void <init>(com.android.tools.r8.ir.code.Position):551:552 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$Interval -> com.android.tools.r8.internal.G6$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList keys -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():754:754 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):758:758 -> <init>
-    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):756:762 -> <init>
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):754:754 -> a
-    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):792:792 -> a
-    1:1:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMax():771:771 -> b
-    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):780 -> b
-    2:2:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMin():767:767 -> b
-    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):780 -> b
-    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):781:781 -> b
+    1:1:void <clinit>():757:757 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):761:761 -> <init>
+    2:8:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList[]):759:765 -> <init>
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList access$000(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):757:757 -> a
+    2:2:long estimatedSize(com.android.tools.r8.utils.InternalOutputMode):795:795 -> a
+    1:1:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMax():774:774 -> b
+    1:1:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):783 -> b
+    2:2:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMin():770:770 -> b
+    2:2:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):783 -> b
+    3:3:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):784:784 -> b
     4:4:int com.android.tools.r8.ir.code.IntSwitch.baseSparseSize(com.android.tools.r8.utils.InternalOutputMode):120:120 -> b
-    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):785 -> b
-    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):785:785 -> b
+    4:4:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):788 -> b
+    5:5:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):788:788 -> b
     6:6:int com.android.tools.r8.ir.code.IntSwitch.basePackedSize(com.android.tools.r8.utils.InternalOutputMode):109:109 -> b
-    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):787 -> b
-    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):787:787 -> b
-    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):775:775 -> b
-    9:9:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMax():771:771 -> b
-    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):775 -> b
-    10:10:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMin():767:767 -> b
-    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):775 -> b
-    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):775:776 -> b
-com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.internal.B6$g:
+    6:6:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):790 -> b
+    7:7:long packedSavings(com.android.tools.r8.utils.InternalOutputMode):790:790 -> b
+    8:8:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778:778 -> b
+    9:9:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMax():774:774 -> b
+    9:9:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778 -> b
+    10:10:int com.android.tools.r8.ir.optimize.CodeRewriter$Interval.getMin():770:770 -> b
+    10:10:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778 -> b
+    11:12:void addInterval(com.android.tools.r8.ir.optimize.CodeRewriter$Interval):778:779 -> b
+com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult -> com.android.tools.r8.internal.G6$g:
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult NO_REMOVALS -> a
     com.android.tools.r8.ir.optimize.CodeRewriter$RemoveCheckCastInstructionIfTrivialResult REMOVED_CAST_DO_NARROW -> b
-    1:2:void <clinit>():1301:1302 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1300:1300 -> <init>
-com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.B6$h:
+    1:2:void <clinit>():1304:1305 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1303:1303 -> <init>
+com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder -> com.android.tools.r8.internal.G6$h:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap keyToTarget -> d
     com.android.tools.r8.ir.code.BasicBlock fallthrough -> e
     com.android.tools.r8.ir.code.Value value -> c
-    1:1:void <init>(com.android.tools.r8.ir.code.Position):566:566 -> <init>
-    2:2:void <init>(com.android.tools.r8.ir.code.Position):562:562 -> <init>
-    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):575:575 -> a
-    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):580:580 -> a
-    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):585:585 -> a
-    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):591:612 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1465:1468 -> a
-    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):612 -> a
-    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):613:614 -> a
-    32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):603:603 -> a
-    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):609:609 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.f7:
+    1:1:void <init>(com.android.tools.r8.ir.code.Position):569:569 -> <init>
+    2:2:void <init>(com.android.tools.r8.ir.code.Position):565:565 -> <init>
+    1:1:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setValue(com.android.tools.r8.ir.code.Value):578:578 -> a
+    2:2:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder addKeyAndTarget(int,com.android.tools.r8.ir.code.BasicBlock):583:583 -> a
+    3:3:com.android.tools.r8.ir.optimize.CodeRewriter$SwitchBuilder setFallthrough(com.android.tools.r8.ir.code.BasicBlock):588:588 -> a
+    4:25:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):594:615 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.code.BasicBlock.createSwitchBlock(int,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.code.IRMetadata):1467:1470 -> a
+    26:29:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):615 -> a
+    30:31:com.android.tools.r8.ir.code.BasicBlock build(com.android.tools.r8.ir.code.IRMetadata):616:617 -> a
+    32:32:java.lang.Integer lambda$build$0(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):606:606 -> a
+    1:1:java.lang.Integer lambda$build$1(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap,com.android.tools.r8.ir.code.BasicBlock):612:612 -> b
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer -> com.android.tools.r8.internal.k7:
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> b
     int numberOfConstClassCanonicalization -> f
     int numberOfEffectivelyFinalFieldCanonicalization -> g
@@ -40198,10 +40550,10 @@
     53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexField.getHolderType():30:30 -> a
     53:53:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):153 -> a
     54:55:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):154:155 -> a
-    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    56:56:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     56:56:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):160 -> a
     57:57:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):161:161 -> a
-    58:58:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():162:162 -> a
+    58:58:boolean com.android.tools.r8.graph.DexEncodedField.isEnum():163:163 -> a
     58:58:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):163 -> a
     59:65:void canonicalize(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):164:170 -> a
     66:67:boolean com.android.tools.r8.ir.optimize.ConstantCanonicalizer.constantUsedByInvokeRange(com.android.tools.r8.ir.code.Instruction):292:293 -> a
@@ -40228,7 +40580,7 @@
     348:348:boolean lambda$canonicalize$2(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):199:199 -> a
     349:349:int lambda$canonicalize$4(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):209:209 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):208:208 -> b
-com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.e7:
+com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1 -> com.android.tools.r8.internal.j7:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():95:95 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.ConstantCanonicalizer):95:95 -> <init>
@@ -40244,7 +40596,7 @@
     29:29:int hashCode(java.lang.Object):95 -> a
     30:30:int com.android.tools.r8.ir.optimize.ConstantCanonicalizer$1.hashCode(com.android.tools.r8.ir.code.Instruction):102:102 -> a
     30:30:int hashCode(java.lang.Object):95 -> a
-com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.A7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover -> com.android.tools.r8.internal.F7:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.optimize.CodeRewriter codeRewriter -> c
     boolean $assertionsDisabled -> a
@@ -40273,7 +40625,7 @@
     62:65:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):157:160 -> a
     66:91:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):189:214 -> a
     66:91:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):161 -> a
-    92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    92:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     92:92:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):214 -> a
     92:92:boolean removeUnneededCatchHandlers(com.android.tools.r8.ir.code.IRCode):161 -> a
     93:100:java.util.Collection com.android.tools.r8.ir.optimize.DeadCodeRemover.getDeadCatchHandlers(com.android.tools.r8.ir.code.BasicBlock):214:221 -> a
@@ -40285,7 +40637,7 @@
     15:15:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):73 -> b
     16:16:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):74:74 -> b
     17:17:boolean verifyNoDeadCode(com.android.tools.r8.ir.code.IRCode):73:73 -> b
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.A7$a:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult -> com.android.tools.r8.internal.F7$a:
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_DEAD_INSTANCE -> a
     com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult DEFINITELY_NOT_DEAD_INSTANCE -> b
     1:9:void <clinit>():226:234 -> <clinit>
@@ -40296,11 +40648,11 @@
     boolean isMaybeDead() -> c
     boolean isNotDead() -> d
     1:1:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult notDead():247:247 -> e
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.x7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$1 -> com.android.tools.r8.internal.C7:
     1:1:void <init>():227:227 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.y7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$2 -> com.android.tools.r8.internal.D7:
     1:1:void <init>():235:235 -> <init>
-com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.z7:
+com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult$3 -> com.android.tools.r8.internal.E7:
     com.android.tools.r8.ir.code.Value val$inValueRequiredToBeDead -> c
     1:1:void <init>(com.android.tools.r8.ir.code.Value):251:251 -> <init>
     1:1:java.lang.Iterable getValuesRequiredToBeDead():264:264 -> b
@@ -40324,49 +40676,49 @@
     40:42:boolean isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):92:94 -> a
     40:42:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):263 -> a
     43:52:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):122:131 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     53:53:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):131 -> a
     54:79:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):131:156 -> a
-    80:185:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):0:105 -> a
-    80:185:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):156 -> a
-    186:186:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):158:158 -> a
-    187:187:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
-    187:187:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):158 -> a
-    188:235:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):159:206 -> a
-    236:236:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):205:205 -> a
-    237:241:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):211:215 -> a
-    242:242:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
-    243:243:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):252:252 -> a
-    244:267:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):296:319 -> a
-    268:277:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):331:340 -> a
-    278:289:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):356:367 -> a
-    290:299:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):364:373 -> a
-    300:315:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):372:387 -> a
-    316:316:java.lang.Boolean lambda$isTargetClassInitialized$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):366:366 -> a
-    317:319:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):397:399 -> a
-    320:320:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    320:320:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):399 -> a
-    321:321:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):401:401 -> a
-    322:322:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):888:888 -> a
-    322:322:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):401 -> a
-    323:323:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):882:882 -> a
+    80:186:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):0:106 -> a
+    80:186:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):156 -> a
+    187:187:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):158:158 -> a
+    188:188:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
+    188:188:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):158 -> a
+    189:236:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):159:206 -> a
+    237:237:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):205:205 -> a
+    238:242:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):211:215 -> a
+    243:243:boolean inlineeRefersToClassesNotInMainDex(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
+    244:244:com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):252:252 -> a
+    245:268:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeWithReceiver(com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):296:319 -> a
+    269:278:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvokeStatic(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):331:340 -> a
+    279:290:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):356:367 -> a
+    291:300:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):364:373 -> a
+    301:316:boolean isTargetClassInitialized(com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis):372:387 -> a
+    317:317:java.lang.Boolean lambda$isTargetClassInitialized$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.InitializedClassesInInstanceMethodsAnalysis$InitializedClassesInInstanceMethods):366:366 -> a
+    318:320:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):397:399 -> a
+    321:321:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    321:321:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):399 -> a
+    322:322:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):401:401 -> a
+    323:323:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):888:888 -> a
     323:323:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):401 -> a
-    324:335:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:421 -> a
-    336:428:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):437:529 -> a
-    429:434:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):536:541 -> a
-    435:435:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):553:553 -> a
-    436:438:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):564:566 -> a
-    436:438:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):556 -> a
-    439:439:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):557:557 -> a
-    440:456:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):651:667 -> a
-    440:456:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
-    457:489:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):586:618 -> a
-    490:490:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):677:677 -> a
+    324:324:void com.android.tools.r8.ir.optimize.Inliner.performInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.utils.Timing):882:882 -> a
+    324:324:void ensureMethodProcessed(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):401 -> a
+    325:336:boolean allowInliningOfInvokeInInlinee(com.android.tools.r8.ir.optimize.Inliner$InlineAction,int,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):410:421 -> a
+    337:429:boolean canInlineInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):437:529 -> a
+    430:435:boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):536:541 -> a
+    436:436:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):553:553 -> a
+    437:439:boolean willExceedInstructionBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):564:566 -> a
+    437:439:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):556 -> a
+    440:440:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):557:557 -> a
+    441:457:boolean willExceedControlFlowResolutionBlocksBudget(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):651:667 -> a
+    441:457:boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):558 -> a
+    458:490:boolean willExceedMonitorEnterValuesBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):586:618 -> a
+    491:491:void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason):677:677 -> a
     1:1:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):221:221 -> b
     2:13:int computeInstructionLimit(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):230:241 -> b
     2:13:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):222 -> b
     14:14:boolean satisfiesRequirementsForSimpleInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):223:223 -> b
-com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.r8:
+com.android.tools.r8.ir.optimize.Devirtualizer -> com.android.tools.r8.internal.w8:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
@@ -40397,12 +40749,12 @@
     99:560:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
     561:561:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):301:301 -> a
     561:561:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    562:562:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    562:562:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     562:562:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):301 -> a
     562:562:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
     563:573:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):303:313 -> a
     563:573:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
-    574:574:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):54:54 -> a
+    574:574:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.graph.AccessControl.isMemberAccessible(com.android.tools.r8.graph.DexClassAndMember,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView):53:53 -> a
     574:574:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):313 -> a
     574:574:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):147 -> a
     575:575:com.android.tools.r8.graph.DexClassAndMethod com.android.tools.r8.ir.optimize.Devirtualizer.rebindSuperInvokeToMostSpecific(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):313:313 -> a
@@ -40415,21 +40767,18 @@
     638:638:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
     638:638:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):171 -> a
     639:675:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):174:210 -> a
-    676:695:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):209:228 -> a
-    696:696:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    696:696:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):235 -> a
-    697:719:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):237:259 -> a
-    720:720:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
-    720:720:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):259 -> a
-    721:736:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):261:276 -> a
-    737:741:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):275:279 -> a
-    742:742:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():90:90 -> a
-    742:742:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):285 -> a
-    743:745:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):286:288 -> a
-    746:746:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    746:746:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288 -> a
-    747:749:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288:290 -> a
-com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.c9:
+    676:726:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):209:259 -> a
+    727:727:void com.android.tools.r8.ir.code.DominatorTree.<init>(com.android.tools.r8.ir.code.IRCode):37:37 -> a
+    727:727:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):259 -> a
+    728:743:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):261:276 -> a
+    744:748:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):275:279 -> a
+    749:749:com.android.tools.r8.ir.optimize.AssumeRemover com.android.tools.r8.ir.optimize.AssumeRemover.removeMarkedInstructions():90:90 -> a
+    749:749:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):285 -> a
+    750:752:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):286:288 -> a
+    753:753:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    753:753:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288 -> a
+    754:756:void devirtualizeInvokeInterface(com.android.tools.r8.ir.code.IRCode):288:290 -> a
+com.android.tools.r8.ir.optimize.DynamicTypeOptimization -> com.android.tools.r8.internal.l9:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -40455,7 +40804,7 @@
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeForInvoke(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):77:89 -> a
     6:18:com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):70 -> a
     19:22:com.android.tools.r8.graph.DexType getReceiverTypeIfKnown(com.android.tools.r8.ir.code.InvokeMethod):135:138 -> a
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.tc:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer -> com.android.tools.r8.internal.Cc:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap histogramOfCanonicalizationCandidatesPerMethod -> f
@@ -40494,7 +40843,7 @@
     221:243:void insertCanonicalizedInvokeWithInValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Invoke):287:309 -> a
     244:244:boolean lambda$insertCanonicalizedInvokeWithInValues$6(com.android.tools.r8.ir.code.Instruction):304:304 -> a
     1:1:boolean lambda$canonicalize$3(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):214:214 -> b
-com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.sc:
+com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer$1 -> com.android.tools.r8.internal.Bc:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():97:97 -> <clinit>
     1:1:void <init>(com.android.tools.r8.ir.optimize.IdempotentFunctionCallCanonicalizer):97:97 -> <init>
@@ -40551,23 +40900,23 @@
     248:262:void postProcessInlineeBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.utils.Timing):1161:1175 -> a
     248:262:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1079 -> a
     263:263:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082:1082 -> a
-    264:264:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
+    264:264:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():476:476 -> a
     264:264:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082 -> a
     265:265:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082:1082 -> a
-    266:266:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
+    266:266:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():476:476 -> a
     266:266:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1082 -> a
     267:286:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1083:1102 -> a
-    287:289:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):71:73 -> a
+    287:289:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):81:83 -> a
     287:289:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1102 -> a
     290:290:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1103:1103 -> a
-    291:291:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):77:77 -> a
+    291:291:java.lang.Object com.android.tools.r8.utils.IteratorUtils.previousUntil(java.util.ListIterator,java.util.function.Predicate):87:87 -> a
     291:291:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1102 -> a
     292:292:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     292:292:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1105 -> a
     293:303:void performInliningImpl(com.android.tools.r8.ir.optimize.InliningStrategy,com.android.tools.r8.ir.optimize.InliningOracle,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.utils.Timing):1106:1116 -> a
     304:310:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1120:1126 -> a
     304:310:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
-    311:311:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    311:311:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     311:311:boolean containsPotentialCatchHandlerVerificationError(com.android.tools.r8.ir.code.IRCode):1126 -> a
     311:311:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget computeInliningConstraint(com.android.tools.r8.ir.code.IRCode):174 -> a
     312:312:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
@@ -40618,29 +40967,29 @@
     5:9:void <init>(com.android.tools.r8.ir.optimize.Inliner$Constraint,com.android.tools.r8.graph.DexType):342:346 -> <init>
     1:24:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget deriveConstraint(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags,com.android.tools.r8.graph.AppView):369:392 -> a
     25:30:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):398:403 -> a
-    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    31:31:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     31:31:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):406 -> a
     32:33:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget classIsVisible(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):408:409 -> a
     34:84:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):414:464 -> a
     85:85:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):541:541 -> a
     85:85:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
-    86:86:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    86:86:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     86:86:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):542 -> a
     86:86:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
     87:92:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):543:548 -> a
     87:92:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
-    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     93:93:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):548 -> a
     93:93:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
     94:96:boolean verifyAllNestInSamePackage(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):549:551 -> a
     94:96:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):464 -> a
     97:104:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):465:472 -> a
-    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    105:105:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     105:105:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):518 -> a
     105:105:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):472 -> a
     106:113:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):520:527 -> a
     106:113:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):472 -> a
-    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     114:114:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):527 -> a
     114:114:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):472 -> a
     115:119:boolean allNestMembersSubtypeOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):529:533 -> a
@@ -40648,7 +40997,7 @@
     120:153:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget meet(com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget,com.android.tools.r8.graph.AppView):476:509 -> a
     1:5:boolean equals(java.lang.Object):359:363 -> equals
     1:4:int hashCode():351:354 -> hashCode
-    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():61:61 -> hashCode
+    5:5:int com.android.tools.r8.graph.DexType.computeHashCode():66:66 -> hashCode
     5:5:int hashCode():354 -> hashCode
 com.android.tools.r8.ir.optimize.Inliner$InlineAction -> com.android.tools.r8.ir.optimize.c$c:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> c
@@ -40662,48 +41011,38 @@
     3:11:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):609:617 -> a
     12:23:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):759:770 -> a
     12:23:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):618 -> a
-    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    24:24:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):770 -> a
-    24:24:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):618 -> a
-    25:25:void synthesizeInitClass(com.android.tools.r8.ir.code.IRCode):770:770 -> a
-    25:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):618 -> a
-    26:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):628:629 -> a
-    28:28:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
-    28:28:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):629 -> a
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    29:29:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):629 -> a
-    30:32:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):630:632 -> a
-    33:56:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):774:797 -> a
-    33:56:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):634 -> a
-    57:59:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):639:641 -> a
-    60:66:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):640:646 -> a
-    67:67:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    67:67:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):647 -> a
-    68:78:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):647:657 -> a
-    79:79:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
-    79:79:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):662 -> a
-    80:80:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):662:662 -> a
-    81:86:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):661:666 -> a
-    87:87:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    87:87:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):668 -> a
-    88:88:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):668:668 -> a
-    89:102:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):666:679 -> a
-    103:103:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1147:1147 -> a
-    103:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):681 -> a
-    104:105:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):682:683 -> a
-    106:106:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):143:143 -> a
-    106:106:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685 -> a
-    107:136:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:718 -> a
-    137:137:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    137:137:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):717 -> a
-    138:174:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):719:755 -> a
-    175:175:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):684:684 -> a
+    24:25:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):628:629 -> a
+    26:26:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
+    26:26:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):629 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    27:27:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):629 -> a
+    28:30:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):630:632 -> a
+    31:54:void synthesizeNullCheckForReceiver(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):774:797 -> a
+    31:54:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):634 -> a
+    55:57:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):639:641 -> a
+    58:64:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):640:646 -> a
+    65:65:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    65:65:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):647 -> a
+    66:76:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):647:657 -> a
+    77:77:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
+    77:77:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):662 -> a
+    78:78:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):662:662 -> a
+    79:86:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):661:668 -> a
+    87:100:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):666:679 -> a
+    101:101:com.android.tools.r8.ir.code.Phi com.android.tools.r8.ir.code.IRCode.createPhi(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.analysis.type.TypeElement):1144:1144 -> a
+    101:101:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):681 -> a
+    102:103:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):682:683 -> a
+    104:104:void com.android.tools.r8.ir.code.Phi.addOperands(java.util.List):143:143 -> a
+    104:104:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):685 -> a
+    105:134:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):689:718 -> a
+    135:173:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.conversion.LensCodeRewriter):717:755 -> a
+    174:174:com.android.tools.r8.ir.code.Value lambda$buildInliningIR$0(com.android.tools.r8.ir.code.BasicBlock):684:684 -> a
     1:2:void setShouldSynthesizeNullCheckForReceiver():598:599 -> b
 com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason -> com.android.tools.r8.ir.optimize.d:
     com.android.tools.r8.ir.optimize.Inliner$Reason reason -> a
     com.android.tools.r8.ir.code.IRCode code -> b
     1:3:void <init>(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner$Reason):807:809 -> <init>
-com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Gd:
+com.android.tools.r8.ir.optimize.Inliner$InliningInfo -> com.android.tools.r8.internal.Ud:
     com.android.tools.r8.graph.DexType receiverType -> b
     com.android.tools.r8.graph.ProgramMethod target -> a
     1:3:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):853:855 -> <init>
@@ -40772,7 +41111,7 @@
     2:2:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):129:129 -> c
     3:3:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstancePut(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):141:141 -> c
     4:15:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):202:213 -> c
-    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
+    16:16:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
     16:16:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):213 -> c
     17:21:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):214:218 -> c
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):137:137 -> d
@@ -40783,7 +41122,7 @@
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forInvokeNewArray(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):194:194 -> f
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewArrayEmpty(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):283:283 -> g
     1:1:com.android.tools.r8.ir.optimize.Inliner$ConstraintWithTarget forNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):291:291 -> h
-com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Jd:
+com.android.tools.r8.ir.optimize.InliningOracle -> com.android.tools.r8.internal.Xd:
     com.android.tools.r8.ir.optimize.Inliner$InlineAction computeInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean isForcedInliningOracle() -> a
     com.android.tools.r8.graph.ProgramMethod lookupSingleTarget(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod) -> a
@@ -40796,7 +41135,7 @@
     void markInlined(com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason) -> a
     boolean stillHasBudget(com.android.tools.r8.ir.optimize.Inliner$InlineAction,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
     boolean willExceedBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter) -> a
-com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.ie:
+com.android.tools.r8.ir.optimize.InstructionEquivalence -> com.android.tools.r8.internal.we:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> a
     1:2:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):14:15 -> <init>
     1:1:boolean doEquivalent(java.lang.Object,java.lang.Object):11:11 -> a
@@ -40804,7 +41143,7 @@
     3:12:int com.android.tools.r8.ir.optimize.InstructionEquivalence.doHash(com.android.tools.r8.ir.code.Instruction):27:36 -> a
     3:12:int doHash(java.lang.Object):11 -> a
     13:14:boolean doEquivalent(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction):20:21 -> a
-com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.Rn:
+com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool -> com.android.tools.r8.internal.do:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set interfaces -> d
     java.util.Set subTypes -> e
@@ -40834,7 +41173,7 @@
     4:4:boolean lambda$hasSeenBelow$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):225:225 -> c
     1:1:boolean hasSeenStrictlyBelow(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):216:216 -> d
     1:2:void seen(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):191:192 -> e
-com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.go:
+com.android.tools.r8.ir.optimize.MemberValuePropagation -> com.android.tools.r8.internal.so:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedback feedback -> a
     com.android.tools.r8.graph.AppView appView -> c
     java.util.Set warnedFields -> e
@@ -40861,17 +41200,17 @@
     72:79:boolean tryConstantReplacementFromProguard(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup):219:226 -> a
     80:87:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):329:336 -> a
     88:91:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):335:338 -> a
-    92:92:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    92:92:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     92:92:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):343 -> a
     93:93:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     93:93:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):343 -> a
     94:98:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexEncodedField):100:104 -> a
     94:98:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):347 -> a
     99:109:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):352:362 -> a
-    110:110:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    110:110:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     110:110:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):362 -> a
     111:114:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):364:367 -> a
-    115:115:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    115:115:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     115:115:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):370 -> a
     116:120:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):372:376 -> a
     121:144:void rewriteFieldGetWithConstantValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):374:397 -> a
@@ -40883,74 +41222,71 @@
     164:186:void replaceInstructionByNullCheckIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):423:445 -> a
     187:198:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):454:465 -> a
     199:212:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):460:473 -> a
-    213:213:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    213:213:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     213:213:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):473 -> a
-    214:216:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):473:475 -> a
-    217:217:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    217:217:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):475 -> a
-    218:218:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):476:476 -> a
-    219:219:boolean lambda$replaceInstructionByInitClassIfPossible$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):464:464 -> a
-    220:227:void run(com.android.tools.r8.ir.code.IRCode):521:528 -> a
-    228:228:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    228:228:void run(com.android.tools.r8.ir.code.IRCode):528 -> a
-    229:232:void run(com.android.tools.r8.ir.code.IRCode):528:531 -> a
-    233:244:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):539:550 -> a
-    245:259:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):239:253 -> a
-    245:259:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
-    260:260:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup com.android.tools.r8.ir.optimize.MemberValuePropagation.lookupMemberRule(com.android.tools.r8.graph.DexClassAndMethod):116:116 -> a
-    260:260:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):254 -> a
-    260:260:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
-    261:279:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259:277 -> a
-    261:279:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
-    280:280:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
-    280:280:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):108 -> a
-    280:280:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
-    280:280:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
-    281:284:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):109:112 -> a
-    281:284:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
-    281:284:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
-    285:304:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):289:308 -> a
-    285:304:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
-    305:316:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307:318 -> a
-    305:316:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
-    317:319:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551:553 -> a
-    320:323:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):552:555 -> a
-    324:324:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):482:482 -> a
+    214:217:void replaceInstructionByInitClassIfPossible(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.graph.ProgramMethod):473:476 -> a
+    218:218:boolean lambda$replaceInstructionByInitClassIfPossible$1(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexType):464:464 -> a
+    219:226:void run(com.android.tools.r8.ir.code.IRCode):521:528 -> a
+    227:227:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    227:227:void run(com.android.tools.r8.ir.code.IRCode):528 -> a
+    228:231:void run(com.android.tools.r8.ir.code.IRCode):528:531 -> a
+    232:243:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):539:550 -> a
+    244:258:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):239:253 -> a
+    244:258:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    259:259:com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup com.android.tools.r8.ir.optimize.MemberValuePropagation.lookupMemberRule(com.android.tools.r8.graph.DexClassAndMethod):116:116 -> a
+    259:259:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):254 -> a
+    259:259:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    260:278:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):259:277 -> a
+    260:278:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    279:279:boolean com.android.tools.r8.graph.DexClassAndMethod.isProgramMethod():0:0 -> a
+    279:279:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):108 -> a
+    279:279:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
+    279:279:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    280:283:boolean com.android.tools.r8.ir.optimize.MemberValuePropagation.mayPropagateValueFor(com.android.tools.r8.graph.DexClassAndMethod):109:112 -> a
+    280:283:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):284 -> a
+    280:283:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    284:303:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):289:308 -> a
+    284:303:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    304:315:void com.android.tools.r8.ir.optimize.MemberValuePropagation.rewriteInvokeMethodWithConstantValues(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,java.util.Set,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):307:318 -> a
+    304:315:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):549 -> a
+    316:318:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):551:553 -> a
+    319:322:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):552:555 -> a
+    323:323:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):482:482 -> a
+    323:323:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
+    324:324:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
+    324:324:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):483 -> a
     324:324:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
-    325:325:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    325:325:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):483 -> a
+    325:325:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
+    325:325:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490 -> a
     325:325:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
-    326:326:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
-    326:326:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490 -> a
-    326:326:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
-    327:331:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490:494 -> a
-    327:331:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
-    332:333:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556:557 -> a
-    334:334:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):499:499 -> a
+    326:330:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceInstancePutByNullCheckIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InstancePut):490:494 -> a
+    326:330:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):555 -> a
+    331:332:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):556:557 -> a
+    333:333:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):499:499 -> a
+    333:333:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    334:334:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
+    334:334:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):500 -> a
     334:334:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
-    335:335:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    335:335:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):500 -> a
+    335:335:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
+    335:335:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):507 -> a
     335:335:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
-    336:336:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexEncodedField.type():65:65 -> a
-    336:336:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):507 -> a
-    336:336:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
-    337:342:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):507:512 -> a
-    337:342:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
-    343:343:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):511:511 -> a
-    343:343:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
-com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.internal.eo:
+    336:341:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):507:512 -> a
+    336:341:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+    342:342:void com.android.tools.r8.ir.optimize.MemberValuePropagation.replaceStaticPutByInitClassIfNeverRead(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.StaticPut):511:511 -> a
+    342:342:void run(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,java.util.Set,java.util.function.Predicate):557 -> a
+com.android.tools.r8.ir.optimize.MemberValuePropagation$ProguardMemberRuleLookup -> com.android.tools.r8.internal.qo:
     com.android.tools.r8.shaking.ProguardMemberRule rule -> b
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType type -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType,com.android.tools.r8.shaking.ProguardMemberRule):74:76 -> <init>
     1:5:boolean equals(java.lang.Object):81:85 -> equals
     1:1:int hashCode():90:90 -> hashCode
-com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.internal.fo:
+com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType -> com.android.tools.r8.internal.ro:
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_VALUES -> c
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType NONE -> a
     com.android.tools.r8.ir.optimize.MemberValuePropagation$RuleType ASSUME_NO_SIDE_EFFECTS -> b
     1:3:void <clinit>():64:66 -> <clinit>
     1:1:void <init>(java.lang.String,int):63:63 -> <init>
-com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.Io:
+com.android.tools.r8.ir.optimize.MethodPoolCollection -> com.android.tools.r8.internal.Uo:
     com.android.tools.r8.com.google.common.base.Equivalence com.android.tools.r8.ir.optimize.MemberPoolCollection.equivalence -> b
     com.android.tools.r8.graph.AppView com.android.tools.r8.ir.optimize.MemberPoolCollection.appView -> c
     com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.ir.optimize.MemberPoolCollection.subtypingInfo -> d
@@ -40988,7 +41324,7 @@
     30:30:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateImplementsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):236:236 -> a
     30:30:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSubTypesExclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):152 -> a
     31:31:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141:141 -> a
-    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     32:32:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141 -> a
     33:33:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> a
     33:33:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$1(java.util.Deque,com.android.tools.r8.graph.DexType):141 -> a
@@ -41005,41 +41341,41 @@
     30:31:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):85:86 -> b
     30:31:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool com.android.tools.r8.ir.optimize.MemberPoolCollection.get(com.android.tools.r8.graph.DexClass):0 -> b
     32:42:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):116:126 -> b
-    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    43:43:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     43:43:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):126 -> b
     44:44:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
     44:44:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):126 -> b
     45:46:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):128:129 -> b
-    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     47:47:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):129 -> b
     48:48:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
     48:48:java.util.Set com.android.tools.r8.ir.optimize.MemberPoolCollection.getAllSuperTypesInclusive(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):129 -> b
     49:49:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143:143 -> b
-    50:50:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    50:50:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     50:50:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143 -> b
     51:51:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> b
     51:51:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$2(java.util.Deque,com.android.tools.r8.graph.DexType):143 -> b
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$0(com.android.tools.r8.graph.DexClass):57:57 -> c
     2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):151:151 -> c
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
     3:3:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):151 -> c
     4:4:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> c
     4:4:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$3(java.util.Deque,com.android.tools.r8.graph.DexType):151 -> c
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$2(com.android.tools.r8.graph.DexClass):68:68 -> d
     2:2:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):153:153 -> d
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> d
     3:3:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):153 -> d
     4:4:void com.android.tools.r8.ir.optimize.MemberPoolCollection.addNonNull(java.util.Collection,java.lang.Object):231:231 -> d
     4:4:void com.android.tools.r8.ir.optimize.MemberPoolCollection.lambda$getAllSubTypesExclusive$4(java.util.Deque,com.android.tools.r8.graph.DexType):153 -> d
     1:1:com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool lambda$computeMemberPoolForClass$3(com.android.tools.r8.graph.DexClass):78:78 -> e
     1:10:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):56:65 -> f
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> f
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> f
     11:11:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):65 -> f
     12:20:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):67:75 -> f
-    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> f
+    21:21:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> f
     21:21:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):75 -> f
     22:25:void lambda$computeMemberPoolForClass$4(com.android.tools.r8.graph.DexClass):77:80 -> f
-com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.So:
+com.android.tools.r8.ir.optimize.MoveEliminator -> com.android.tools.r8.internal.ep:
     com.android.tools.r8.ir.regalloc.RegisterAllocator allocator -> b
     java.util.Set activeMoves -> a
     1:1:void <init>(com.android.tools.r8.ir.regalloc.RegisterAllocator):17:17 -> <init>
@@ -41047,13 +41383,13 @@
     1:12:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):22:33 -> a
     13:51:boolean shouldBeEliminated(com.android.tools.r8.ir.code.Instruction):32:70 -> a
     52:56:boolean lambda$shouldBeEliminated$0(com.android.tools.r8.ir.code.Value,int,com.android.tools.r8.ir.code.Move):55:59 -> a
-com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.Dp:
+com.android.tools.r8.ir.optimize.NestReducer -> com.android.tools.r8.internal.Pp:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():29:29 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):33:34 -> <init>
     1:2:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):38:39 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     3:3:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):39 -> a
     4:15:void run(java.util.concurrent.ExecutorService):43:54 -> a
     16:24:void run(java.util.concurrent.ExecutorService):53:61 -> a
@@ -41077,7 +41413,7 @@
     51:53:void com.android.tools.r8.ir.optimize.NestReducer.clearNestAttributes(com.android.tools.r8.graph.DexClass):114:116 -> a
     51:53:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):88 -> a
     51:53:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
-    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     54:54:void com.android.tools.r8.ir.optimize.NestReducer.clearNestAttributes(com.android.tools.r8.graph.DexClass):116 -> a
     54:54:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):88 -> a
     54:54:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
@@ -41085,7 +41421,7 @@
     55:55:void com.android.tools.r8.ir.optimize.NestReducer.processNestFrom(com.android.tools.r8.graph.DexClass):88 -> a
     55:55:java.lang.Object lambda$run$0(com.android.tools.r8.graph.DexProgramClass):56 -> a
     56:62:boolean hasPrivateMembers(com.android.tools.r8.graph.DexClass):122:128 -> a
-com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.Ep:
+com.android.tools.r8.ir.optimize.NestUtils -> com.android.tools.r8.internal.Qp:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:14:boolean sameNest(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):28:41 -> a
@@ -41094,27 +41430,27 @@
     16:21:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):48:53 -> a
     22:111:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     22:111:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):54 -> a
-    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     112:112:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     112:112:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):54 -> a
     113:120:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):55:62 -> a
-    121:121:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    121:121:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     121:121:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):61 -> a
     122:123:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64:65 -> a
-    124:124:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    124:124:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     124:124:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):64 -> a
     125:125:boolean com.android.tools.r8.ir.code.Instruction.isInvokeInterface():0:0 -> a
     125:125:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):68 -> a
     126:129:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):68:71 -> a
     130:219:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     130:219:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):72 -> a
-    220:220:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    220:220:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     220:220:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     220:220:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):72 -> a
     221:231:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):73:83 -> a
-    232:232:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    232:232:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     232:232:void rewriteNestCallsForInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView):78 -> a
-com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.Xr:
+com.android.tools.r8.ir.optimize.Outliner -> com.android.tools.r8.internal.js:
     java.util.List candidateMethodLists -> b
     java.util.Map outlineSites -> c
     java.util.Map generatedOutlines -> d
@@ -41140,7 +41476,7 @@
     37:37:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     37:37:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1367 -> a
     38:41:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1367:1370 -> a
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     42:42:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1370 -> a
     43:75:com.android.tools.r8.graph.DexProgramClass buildOutlinerClass(com.android.tools.r8.graph.DexType):1371:1403 -> a
     76:76:void applyOutliningCandidate(com.android.tools.r8.ir.code.IRCode):1420:1420 -> a
@@ -41159,7 +41495,7 @@
     1:1:java.util.Map access$300(com.android.tools.r8.ir.optimize.Outliner):111:111 -> d
     2:27:com.android.tools.r8.utils.collections.ProgramMethodSet selectMethodsForOutlining():1315:1340 -> d
     1:1:java.util.Map access$400(com.android.tools.r8.ir.optimize.Outliner):111:111 -> e
-com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.Tr:
+com.android.tools.r8.ir.optimize.Outliner$BinOpOutlineInstruction -> com.android.tools.r8.internal.fs:
     com.android.tools.r8.ir.code.NumericType numericType -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType,com.android.tools.r8.ir.code.NumericType):213:214 -> <init>
     java.lang.String getDetailsString() -> a
@@ -41213,7 +41549,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():185:185 -> hashCode
     1:1:int hashCode():225 -> hashCode
     2:2:int hashCode():225:225 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.Ur:
+com.android.tools.r8.ir.optimize.Outliner$InvokeOutlineInstruction -> com.android.tools.r8.internal.gs:
     com.android.tools.r8.graph.DexProto proto -> g
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> e
     boolean hasOutValue -> f
@@ -41250,7 +41586,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():185:185 -> hashCode
     1:1:int hashCode():413 -> hashCode
     2:6:int hashCode():413:417 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.Vr:
+com.android.tools.r8.ir.optimize.Outliner$NewInstanceOutlineInstruction -> com.android.tools.r8.internal.hs:
     com.android.tools.r8.graph.DexType clazz -> c
     1:2:void <init>(com.android.tools.r8.graph.DexType):315:316 -> <init>
     1:1:int compareTo(com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction):336:336 -> a
@@ -41269,7 +41605,7 @@
     1:1:int com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction.hashCode():185:185 -> hashCode
     1:1:int hashCode():331 -> hashCode
     2:2:int hashCode():331:331 -> hashCode
-com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.Wr:
+com.android.tools.r8.ir.optimize.Outliner$Outline -> com.android.tools.r8.internal.is:
     java.util.List argumentTypes -> b
     java.util.List templateInstructions -> d
     java.util.List argumentMap -> c
@@ -41293,7 +41629,7 @@
     1:18:boolean equals(java.lang.Object):590:607 -> equals
     1:6:int hashCode():615:620 -> hashCode
     1:37:java.lang.String toString():676:712 -> toString
-com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.Xr$a:
+com.android.tools.r8.ir.optimize.Outliner$OutlineCode -> com.android.tools.r8.internal.js$a:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> d
     com.android.tools.r8.ir.optimize.Outliner$Outline outline -> c
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.ir.optimize.Outliner$Outline):1592:1593 -> <init>
@@ -41307,7 +41643,7 @@
     1:1:java.lang.String toString():1630:1630 -> toString
     int estimatedSizeForInlining() -> u
     boolean isEmptyVoidMethod() -> x
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.Zr:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction -> com.android.tools.r8.internal.ls:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType type -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():126:126 -> <clinit>
@@ -41319,7 +41655,7 @@
     java.lang.String getInstructionName() -> b
     boolean hasOutValue() -> c
     int numberOfInputs() -> d
-com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.Yr:
+com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType -> com.android.tools.r8.internal.ks:
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType[] $VALUES -> h
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType ADD -> a
     com.android.tools.r8.ir.optimize.Outliner$OutlineInstruction$OutlineInstructionType SUB -> b
@@ -41331,13 +41667,13 @@
     1:7:void <clinit>():132:138 -> <clinit>
     8:8:void <clinit>():131:131 -> <clinit>
     1:1:void <init>(java.lang.String,int):131:131 -> <init>
-com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.as:
+com.android.tools.r8.ir.optimize.Outliner$OutlineMethodIdentifier -> com.android.tools.r8.internal.ms:
     java.util.Map candidateMap -> q
     com.android.tools.r8.ir.optimize.Outliner this$0 -> r
     1:3:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock,java.util.Map):1143:1145 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1150:1152 -> a
     4:5:com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder addOutlineMethodList(com.android.tools.r8.ir.optimize.Outliner$Outline):1156:1157 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.bs:
+com.android.tools.r8.ir.optimize.Outliner$OutlineRewriter -> com.android.tools.r8.internal.ns:
     java.util.ListIterator blocksIterator -> s
     java.util.List toRemove -> t
     com.android.tools.r8.ir.optimize.Outliner this$0 -> v
@@ -41355,12 +41691,12 @@
     66:66:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1264 -> a
     67:70:boolean removeMethodFromOutlineList(com.android.tools.r8.ir.optimize.Outliner$Outline):1264:1267 -> a
     71:71:boolean lambda$removeMethodFromOutlineList$0(com.android.tools.r8.graph.ProgramMethod):1266:1266 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.cs:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSiteIdentifier -> com.android.tools.r8.internal.os:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> q
     1:2:void <init>(com.android.tools.r8.ir.optimize.Outliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.BasicBlock):1164:1165 -> <init>
     1:3:void handle(int,int,com.android.tools.r8.ir.optimize.Outliner$Outline):1170:1172 -> a
     4:4:java.util.List lambda$handle$0(com.android.tools.r8.ir.optimize.Outliner$Outline):1171:1171 -> a
-com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.ds:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSourceCode -> com.android.tools.r8.internal.ps:
     com.android.tools.r8.ir.optimize.Outliner this$0 -> e
     int argumentMapIndex -> d
     boolean $assertionsDisabled -> a
@@ -41393,7 +41729,7 @@
     1:1:com.android.tools.r8.ir.code.Position getCurrentPosition():1568:1568 -> e
     boolean verifyRegister(int) -> f
     int instructionIndex(int) -> g
-com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.es:
+com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter -> com.android.tools.r8.internal.qs:
     com.android.tools.r8.graph.DexType returnType -> l
     int returnValueUsersLeft -> n
     int pendingNewInstanceIndex -> o
@@ -41424,7 +41760,7 @@
     14:14:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):926 -> a
     15:20:com.android.tools.r8.graph.DexType argumentTypeFromInvoke(com.android.tools.r8.ir.code.InvokeMethod,int):928:933 -> a
     21:27:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):938:944 -> a
-    28:28:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    28:28:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     28:28:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):944 -> a
     29:35:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):947:953 -> a
     36:59:com.android.tools.r8.graph.DexType argumentTypeFromValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.InvokeMethod,int):959:982 -> a
@@ -41504,7 +41840,7 @@
     181:181:void process():764 -> c
     182:192:void com.android.tools.r8.ir.optimize.Outliner$OutlineSpotter.processInstruction(com.android.tools.r8.ir.code.Instruction):813:823 -> c
     182:192:void process():764 -> c
-com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.us:
+com.android.tools.r8.ir.optimize.PeepholeOptimizer -> com.android.tools.r8.internal.Gs:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():35:35 -> <clinit>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.LinearScanRegisterAllocator):40:40 -> a
@@ -41536,7 +41872,7 @@
     253:264:int com.android.tools.r8.ir.optimize.PeepholeOptimizer.sharedSuffixSize(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):407:418 -> a
     253:264:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):287 -> a
     265:268:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):287:290 -> a
-    269:269:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1151:1151 -> a
+    269:269:int com.android.tools.r8.ir.code.IRCode.getNextBlockNumber():1148:1148 -> a
     269:269:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):298 -> a
     270:272:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):324:326 -> a
     270:272:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
@@ -41552,7 +41888,7 @@
     286:286:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
     287:304:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):338:355 -> a
     287:304:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
-    305:305:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
+    305:305:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
     305:305:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):356 -> a
     305:305:void shareIdenticalBlockSuffix(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator,int):297 -> a
     306:335:com.android.tools.r8.ir.code.BasicBlock com.android.tools.r8.ir.optimize.PeepholeOptimizer.createAndInsertBlockForSuffix(int,int,java.util.List,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.regalloc.RegisterAllocator):357:386 -> a
@@ -41567,18 +41903,18 @@
     357:357:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtBlockExit(com.android.tools.r8.ir.code.BasicBlock):398 -> a
     358:358:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap localsAtBlockExit(com.android.tools.r8.ir.code.BasicBlock):399:399 -> a
     359:379:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):431:451 -> a
-    380:381:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
+    380:381:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
     380:381:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452 -> a
     382:382:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):452:452 -> a
     383:397:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):451:465 -> a
-    398:398:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
+    398:398:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
     398:398:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466 -> a
     399:402:void removeIdenticalPredecessorBlocks(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.regalloc.RegisterAllocator):466:469 -> a
     403:405:void removeWideConstantCovering(java.util.Map,int):542:544 -> a
     1:19:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):207:225 -> b
     20:20:boolean mayShareIdenticalBlockPrefix(com.android.tools.r8.ir.code.BasicBlock):224:224 -> b
     21:21:java.util.List lambda$shareIdenticalBlockSuffix$2(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):271:271 -> b
-com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.ws:
+com.android.tools.r8.ir.optimize.PhiOptimizations -> com.android.tools.r8.internal.Is:
     1:1:void <init>():21:21 -> <init>
     1:1:boolean optimize(com.android.tools.r8.ir.code.IRCode):24:24 -> a
     1:6:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):112:117 -> b
@@ -41605,7 +41941,7 @@
     38:49:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
     50:63:boolean com.android.tools.r8.ir.optimize.PhiOptimizations.tryMovePhiToStack(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Phi,java.util.Set):160:173 -> b
     50:63:boolean tryMovePhisToStack(com.android.tools.r8.ir.code.IRCode):118 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.Kv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination -> com.android.tools.r8.internal.fw:
     com.android.tools.r8.ir.code.IRCode code -> e
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState activeState -> h
@@ -41620,7 +41956,7 @@
     1:1:boolean com.android.tools.r8.graph.DexClassAndField.isProgramField():0:0 -> a
     1:1:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):153 -> a
     2:2:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):156:156 -> a
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> a
     3:3:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):156 -> a
     4:6:boolean isFinal(com.android.tools.r8.graph.DexClassAndField):157:159 -> a
     7:7:java.util.Set access$000(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):53:53 -> a
@@ -41628,10 +41964,10 @@
     9:28:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):358:377 -> a
     29:29:void handleInvokeDirect(com.android.tools.r8.ir.code.InvokeDirect):365:365 -> a
     30:37:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):380:387 -> a
-    38:38:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
+    38:38:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> a
     38:38:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):388 -> a
     39:47:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):389:397 -> a
-    48:48:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
+    48:48:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> a
     48:48:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):398 -> a
     49:56:void lambda$handleInvokeDirect$1(com.android.tools.r8.ir.code.InvokeDirect,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):399:406 -> a
     57:58:void killAllNonFinalActiveFields():412:413 -> a
@@ -41663,7 +41999,7 @@
     34:34:void run():203 -> b
     35:46:void run():204:215 -> b
     47:60:void run():214:227 -> b
-    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> b
+    61:61:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> b
     61:61:void run():227 -> b
     62:63:void run():227:228 -> b
     64:69:boolean com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination.verifyWasInstanceInitializer():347:352 -> b
@@ -41674,7 +42010,7 @@
     77:77:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> b
     77:77:void run():234 -> b
     78:103:void run():235:260 -> b
-    104:104:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> b
+    104:104:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> b
     104:104:void run():260 -> b
     105:107:void run():260:260 -> b
     109:111:void run():262:264 -> b
@@ -41733,8 +42069,8 @@
     220:222:void run():341:343 -> b
     1:1:com.android.tools.r8.graph.ProgramMethod access$200(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):53:53 -> c
     1:1:com.android.tools.r8.ir.code.IRCode access$300(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination):53:53 -> d
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Dv:
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Ev:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1 -> com.android.tools.r8.internal.Yv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState -> com.android.tools.r8.internal.Zv:
     java.util.LinkedHashSet initializedClasses -> d
     java.util.LinkedHashMap nonFinalInstanceFieldValues -> e
     java.util.LinkedHashMap finalInstanceFieldValues -> b
@@ -41795,7 +42131,7 @@
     3:3:int com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState.size(java.util.Set):831:831 -> e
     3:3:int size():825 -> e
     4:6:int size():825:827 -> e
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.Fv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates -> com.android.tools.r8.internal.aw:
     java.util.LinkedHashMap activeStateAtExit -> b
     boolean $assertionsDisabled -> a
     int capacity -> c
@@ -41811,21 +42147,21 @@
     43:43:void com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockStates.ensureCapacity(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):507:507 -> a
     43:43:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):534 -> a
     44:46:void recordActiveStateOnBlockExit(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState):535:537 -> a
-    47:47:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():585:585 -> a
+    47:47:boolean com.android.tools.r8.ir.code.BasicBlock.isEntry():587:587 -> a
     47:47:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):449 -> a
     48:69:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):450:471 -> a
     70:70:boolean com.android.tools.r8.ir.code.Instruction.isInitClass():0:0 -> a
     70:70:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):472 -> a
     71:71:com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$BlockState computeActiveStateOnBlockEntry(com.android.tools.r8.ir.code.BasicBlock):473:473 -> a
     1:5:void removeState(com.android.tools.r8.ir.code.BasicBlock):541:545 -> b
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.Gv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$ExistingValue -> com.android.tools.r8.internal.bw:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> b
     com.android.tools.r8.ir.code.Value value -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$1):88:88 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.code.Value):92:93 -> <init>
     1:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):98:101 -> a
     1:1:java.lang.String toString():106:106 -> toString
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.Hv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject -> com.android.tools.r8.internal.cw:
     com.android.tools.r8.graph.DexField field -> b
     com.android.tools.r8.ir.code.Value object -> c
     boolean $assertionsDisabled -> a
@@ -41835,9 +42171,9 @@
     1:1:com.android.tools.r8.graph.DexField access$700(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldAndObject):127:127 -> a
     1:5:boolean equals(java.lang.Object):144:148 -> equals
     1:1:int hashCode():139:139 -> hashCode
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.Iv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$FieldValue -> com.android.tools.r8.internal.dw:
     void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction) -> a
-com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.Jv:
+com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination$MaterializableValue -> com.android.tools.r8.internal.ew:
     com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination this$0 -> c
     com.android.tools.r8.ir.analysis.value.SingleValue value -> b
     boolean $assertionsDisabled -> a
@@ -41846,47 +42182,56 @@
     2:4:void <init>(com.android.tools.r8.ir.optimize.RedundantFieldLoadElimination,com.android.tools.r8.ir.analysis.value.SingleValue):114:116 -> <init>
     1:3:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):121:123 -> a
     4:4:void eliminateRedundantRead(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):122:122 -> a
-com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.yw:
+com.android.tools.r8.ir.optimize.ReflectionOptimizer -> com.android.tools.r8.internal.Rw:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():33:33 -> <clinit>
-    1:22:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):39:60 -> a
-    23:46:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual):89:112 -> a
-    23:46:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60 -> a
-    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    47:47:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual):117 -> a
-    47:47:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60 -> a
-    48:60:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForGetClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual):117:129 -> a
-    48:60:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):60 -> a
-    61:63:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode) -> a
-    64:82:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):140:158 -> a
-    64:82:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    83:83:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    83:83:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):158 -> a
-    83:83:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    84:84:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):159:159 -> a
-    84:84:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    85:85:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    85:85:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):159 -> a
-    85:85:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    86:88:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):160:162 -> a
-    86:88:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    89:89:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    89:89:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):162 -> a
-    89:89:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    90:139:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.ReflectionOptimizer.getTypeForClassForName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic):163:212 -> a
-    90:139:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):62 -> a
-    140:141:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):66:67 -> a
-    142:142:com.android.tools.r8.ir.analysis.type.ClassTypeElement com.android.tools.r8.ir.analysis.type.TypeElement.classClassType(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):385:385 -> a
-    142:142:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):67 -> a
-    143:146:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):68:71 -> a
-    147:147:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    147:147:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):71 -> a
-    148:150:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):72:74 -> a
-    151:160:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):73:82 -> a
-    161:161:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    161:161:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82 -> a
-    162:164:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):82:84 -> a
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.Cx:
+    1:1:void <clinit>():35:35 -> <clinit>
+    1:24:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):41:64 -> a
+    25:42:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):192:209 -> a
+    25:42:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    43:43:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    43:43:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):209 -> a
+    43:43:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    44:44:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):210:210 -> a
+    44:44:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    45:45:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    45:45:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):210 -> a
+    45:45:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    46:48:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):211:213 -> a
+    46:48:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    49:49:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    49:49:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):213 -> a
+    49:49:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    50:93:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):214:257 -> a
+    50:93:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    94:95:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBaseOrSameFeatureAs(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramDefinition):97:98 -> a
+    94:95:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):257 -> a
+    94:95:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    96:99:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForClassForNameTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeStatic,java.util.function.BiConsumer):256:259 -> a
+    96:99:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):60 -> a
+    100:101:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):70:71 -> a
+    102:125:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForGetClassTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual,java.util.function.BiConsumer):140:163 -> a
+    102:125:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):67 -> a
+    126:126:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    126:126:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForGetClassTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual,java.util.function.BiConsumer):168 -> a
+    126:126:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):67 -> a
+    127:143:void com.android.tools.r8.ir.optimize.ReflectionOptimizer.applyTypeForGetClassTo(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeVirtual,java.util.function.BiConsumer):168:184 -> a
+    127:143:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):67 -> a
+    144:145:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):77:78 -> a
+    146:146:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
+    146:146:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):78 -> a
+    147:149:void rewriteGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.shaking.MainDexTracingResult):78:80 -> a
+    150:150:boolean lambda$rewriteGetClassOrForNameToConstClass$0(com.android.tools.r8.ir.code.Instruction):54:54 -> a
+    151:151:java.util.function.BiConsumer rewriteSingleGetClassOrForNameToConstClass(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set,com.android.tools.r8.shaking.MainDexTracingResult):90:90 -> a
+    152:156:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):91:95 -> a
+    157:176:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):94:113 -> a
+    177:195:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):108:126 -> a
+    196:198:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):125:127 -> a
+    199:199:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    199:199:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):127 -> a
+    200:202:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):128:130 -> a
+    203:203:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):129:129 -> a
+    204:204:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.MainDexTracingResult,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):119:119 -> a
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter -> com.android.tools.r8.internal.Vx:
     com.android.tools.r8.graph.AppView appView -> c
     java.util.concurrent.atomic.AtomicReference synthesizedClass -> b
     boolean $assertionsDisabled -> a
@@ -41900,7 +42245,7 @@
     30:30:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     30:30:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):120 -> a
     31:79:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):124:172 -> a
-    80:80:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    80:80:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     80:80:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):172 -> a
     81:91:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):176:186 -> a
     92:104:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessingId):185:197 -> a
@@ -41914,7 +42259,7 @@
     133:134:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.ServiceLoaderRewriter.createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):227:228 -> a
     133:134:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):189 -> a
     135:135:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):190:190 -> a
-    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    136:136:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     136:136:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):190 -> a
     137:137:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):191:191 -> a
     138:138:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.ServiceLoaderRewriter.createSynthesizedMethod(com.android.tools.r8.graph.DexType,java.util.List,com.android.tools.r8.ir.conversion.MethodProcessingId):229:229 -> a
@@ -41922,7 +42267,7 @@
     139:175:com.android.tools.r8.graph.DexProgramClass getOrSetSynthesizedClass():233:269 -> a
     176:198:com.android.tools.r8.graph.DexProgramClass lambda$getOrSetSynthesizedClass$1(com.android.tools.r8.graph.DexProgramClass$ChecksumSupplier,com.android.tools.r8.graph.DexProgramClass):244:266 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getSynthesizedClass():86:86 -> b
-com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.Bx:
+com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter -> com.android.tools.r8.internal.Ux:
     com.android.tools.r8.ir.code.IRCode code -> a
     com.android.tools.r8.ir.code.InstructionListIterator iterator -> c
     com.android.tools.r8.ir.code.InvokeStatic serviceLoaderLoad -> b
@@ -41932,7 +42277,7 @@
     2:5:void com.android.tools.r8.ir.optimize.ServiceLoaderRewriter$Rewriter.clearGetClassLoader(com.android.tools.r8.ir.code.InvokeVirtual):329:332 -> a
     2:5:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):312 -> a
     6:18:void perform(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexMethod):313:325 -> a
-com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.Kz:
+com.android.tools.r8.ir.optimize.SwitchCaseEliminator -> com.android.tools.r8.internal.dA:
     com.android.tools.r8.ir.code.BasicBlock alwaysHitTarget -> g
     int alwaysHitCase -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet switchCasesToBeRemoved -> i
@@ -41979,7 +42324,7 @@
     87:88:boolean optimize():89 -> d
     89:89:void com.android.tools.r8.ir.optimize.SwitchCaseEliminator.replaceSwitchByGoto():136:136 -> d
     89:89:boolean optimize():89 -> d
-com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.Lz:
+com.android.tools.r8.ir.optimize.SwitchMapCollector -> com.android.tools.r8.internal.eA:
     com.android.tools.r8.graph.DexString switchMapPrefix -> b
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexString kotlinSwitchMapPrefix -> c
@@ -41997,17 +42342,17 @@
     40:40:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     40:40:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):125 -> a
     41:54:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):125:138 -> a
-    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     55:55:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):138 -> a
     56:61:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):139:144 -> a
     62:62:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     62:62:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):145 -> a
     63:64:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):148:149 -> a
-    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    65:65:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     65:65:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):149 -> a
     66:77:void extractSwitchMap(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.code.IRCode):149:160 -> a
     78:80:boolean maybeIsSwitchMap(com.android.tools.r8.graph.DexEncodedField):165:167 -> a
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.XB:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization -> com.android.tools.r8.internal.sC:
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> a
     boolean $assertionsDisabled -> b
@@ -42039,12 +42384,12 @@
     257:257:com.android.tools.r8.graph.RewrittenPrototypeDescription getPrototypeChanges(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):309:309 -> a
     258:262:com.android.tools.r8.graph.DexMethod getNewMethodSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):337:341 -> a
     1:16:com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection getRemovedArgumentsInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy):317:332 -> b
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.WB:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy -> com.android.tools.r8.internal.rC:
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy ALLOW_ARGUMENT_REMOVAL -> a
     com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$Strategy DISALLOW_ARGUMENT_REMOVAL -> b
     1:2:void <clinit>():47:48 -> <clinit>
     1:1:void <init>(java.lang.String,int):46:46 -> <init>
-com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.XB$a:
+com.android.tools.r8.ir.optimize.UninstantiatedTypeOptimization$UninstantiatedTypeOptimizationGraphLens -> com.android.tools.r8.internal.sC$a:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map removedArgumentsInfoPerMethod -> o
@@ -42053,7 +42398,7 @@
     8:17:void <init>(com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,com.android.tools.r8.graph.AppView):60:69 -> <init>
     1:10:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):75:84 -> a
     11:11:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):83:83 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector -> com.android.tools.r8.internal.FC:
     com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> d
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.com.google.common.collect.BiMap methodMapping -> e
@@ -42087,25 +42432,25 @@
     1:8:void processDirectMethods(com.android.tools.r8.graph.DexProgramClass):215:222 -> b
     1:6:void processVirtualMethods(com.android.tools.r8.graph.DexProgramClass):252:257 -> c
     1:1:java.lang.Runnable runnableForClass(com.android.tools.r8.graph.DexProgramClass):211:211 -> d
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.hC:
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.iC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1 -> com.android.tools.r8.internal.CC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$CollectUsedArguments -> com.android.tools.r8.internal.DC:
     java.util.BitSet used -> a
     1:3:void <init>():336:338 -> <init>
     4:4:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$1):336:336 -> <init>
     1:1:java.util.BitSet getUsedArguments():341:341 -> a
     2:2:boolean register(int):346:346 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.jC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$GloballyUsedSignatures -> com.android.tools.r8.internal.EC:
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> b
     com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool methodPool -> a
     1:2:void <init>(com.android.tools.r8.ir.optimize.UnusedArgumentsCollector,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool):178:179 -> <init>
     1:11:com.android.tools.r8.graph.DexMethod getNewSignature(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProto):188:198 -> a
     12:14:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):204:206 -> a
     15:15:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):205:205 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.kC$a:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UnusedArgumentsGraphLens -> com.android.tools.r8.internal.FC$a:
     java.util.Map removedArguments -> m
     1:9:void <init>(java.util.Map,java.util.Map,java.util.Map,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexItemFactory,java.util.Map):67:75 -> <init>
     1:3:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):81:81 -> a
-com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.lC:
+com.android.tools.r8.ir.optimize.UnusedArgumentsCollector$UsedSignatures -> com.android.tools.r8.internal.GC:
     java.util.Set usedSignatures -> c
     com.android.tools.r8.utils.MethodSignatureEquivalence equivalence -> b
     com.android.tools.r8.ir.optimize.UnusedArgumentsCollector this$0 -> d
@@ -42126,56 +42471,91 @@
     26:26:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):167 -> a
     27:27:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):170:170 -> a
     28:28:com.android.tools.r8.graph.DexEncodedMethod removeArguments(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription$ArgumentInfoCollection):169:169 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.q5:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations -> com.android.tools.r8.internal.QC:
+    1:1:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):24:24 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    2:2:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):25 -> a
+    3:17:com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations synthesizeThrowClassCastExceptionIfNotNullMethod(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.conversion.MethodProcessingId):29:43 -> a
+    18:18:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):38:38 -> a
+    19:19:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createPublicStaticSynthetic():79:79 -> a
+    19:19:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):39 -> a
+    20:21:void lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.synthesis.SyntheticMethodBuilder):39:40 -> a
+    22:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):41:61 -> a
+    22:42:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):49 -> a
+    22:42:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):41 -> a
+    43:53:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):58:68 -> a
+    43:53:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):49 -> a
+    43:53:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):41 -> a
+    54:54:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> a
+    54:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):68 -> a
+    54:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):49 -> a
+    54:54:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):41 -> a
+    55:56:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):68:69 -> a
+    55:56:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):49 -> a
+    55:56:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):41 -> a
+    57:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.templates.CfUtilityMethodsForCodeOptimizations.CfUtilityMethodsForCodeOptimizationsTemplates_throwClassCastExceptionIfNotNull(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):49:73 -> a
+    57:81:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations.getThrowClassCastExceptionIfNotNullCodeTemplate(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.InternalOptions):49 -> a
+    57:81:com.android.tools.r8.graph.Code lambda$synthesizeThrowClassCastExceptionIfNotNullMethod$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):41 -> a
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1 -> com.android.tools.r8.internal.PC:
+com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$UtilityMethodForCodeOptimizations -> com.android.tools.r8.internal.QC$a:
+    boolean $assertionsDisabled -> a
+    com.android.tools.r8.graph.ProgramMethod method -> b
+    boolean optimized -> c
+    1:1:void <clinit>():53:53 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.UtilityMethodsForCodeOptimizations$1):53:53 -> <init>
+    2:3:void <init>(com.android.tools.r8.graph.ProgramMethod):58:59 -> <init>
+    1:2:com.android.tools.r8.graph.ProgramMethod getMethod():63:64 -> a
+    3:4:void optimize(com.android.tools.r8.ir.conversion.MethodProcessor):68:69 -> a
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner -> com.android.tools.r8.internal.s5:
     java.util.concurrent.ConcurrentHashMap knownClasses -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():39:39 -> <clinit>
-    1:8:void <init>():39:46 -> <init>
-    1:58:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):139:196 -> a
-    59:70:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):192:203 -> a
-    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    71:71:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):204 -> a
-    72:96:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):204:228 -> a
-    97:97:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1201:1201 -> a
-    97:97:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):231 -> a
-    98:99:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):232:233 -> a
+    1:1:void <clinit>():40:40 -> <clinit>
+    1:8:void <init>():40:47 -> <init>
+    1:58:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):141:198 -> a
+    59:70:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):194:205 -> a
+    71:71:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    71:71:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):206 -> a
+    72:96:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):206:230 -> a
+    97:97:boolean com.android.tools.r8.ir.code.IRCode.removeAllDeadAndTrivialPhis(java.util.Set):1198:1198 -> a
+    97:97:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
+    98:99:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):234:235 -> a
     100:100:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
-    100:100:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233 -> a
-    101:121:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):233:253 -> a
-    122:123:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2414:2415 -> a
-    122:123:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):255 -> a
-    124:129:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):258:263 -> a
-    130:130:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):140:140 -> a
+    100:100:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235 -> a
+    101:121:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):235:255 -> a
+    122:123:boolean com.android.tools.r8.ir.optimize.CodeRewriter.simplifyControlFlow(com.android.tools.r8.ir.code.IRCode):2464:2465 -> a
+    122:123:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):258 -> a
+    124:129:void processMethodCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.optimize.CodeRewriter,com.android.tools.r8.ir.optimize.string.StringOptimizer,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId,com.android.tools.r8.ir.optimize.Inliner,java.util.function.Supplier):261:266 -> a
+    130:130:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):142:142 -> a
     131:131:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    131:131:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):140 -> a
-    132:132:void lambda$processMethodCode$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):245:245 -> a
-    133:133:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):270:270 -> a
-    133:133:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    134:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):287:298 -> a
-    134:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):272 -> a
-    134:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    146:146:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):719:719 -> a
-    146:146:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):303 -> a
-    146:146:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):272 -> a
-    146:146:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    147:147:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):718:718 -> a
-    147:147:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):303 -> a
-    147:147:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):272 -> a
-    147:147:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    148:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):304:306 -> a
-    148:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):272 -> a
-    148:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):290:290 -> a
-    151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):272 -> a
-    151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-    152:153:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):273:274 -> a
-    152:153:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):158 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.p5:
+    131:131:boolean lambda$processMethodCode$0(com.android.tools.r8.ir.code.Instruction):142 -> a
+    132:132:void lambda$processMethodCode$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):247:247 -> a
+    133:133:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):273:273 -> a
+    133:133:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
+    134:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):290:301 -> a
+    134:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):275 -> a
+    134:145:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
+    146:146:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):747:747 -> a
+    146:146:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):306 -> a
+    146:146:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):275 -> a
+    146:146:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
+    147:147:boolean com.android.tools.r8.graph.DexClass.initializationOfParentTypesMayHaveSideEffects(com.android.tools.r8.graph.AppView):746:746 -> a
+    147:147:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):306 -> a
+    147:147:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):275 -> a
+    147:147:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
+    148:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):307:309 -> a
+    148:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):275 -> a
+    148:150:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
+    151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.computeClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):293:293 -> a
+    151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):275 -> a
+    151:151:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
+    152:153:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus com.android.tools.r8.ir.optimize.classinliner.ClassInliner.isClassEligible(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):276:277 -> a
+    152:153:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus lambda$processMethodCode$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexProgramClass):160 -> a
+com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus -> com.android.tools.r8.internal.r5:
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus ELIGIBLE -> a
     com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus NOT_ELIGIBLE -> b
-    1:2:void <clinit>():42:43 -> <clinit>
-    1:1:void <init>(java.lang.String,int):41:41 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.r5:
+    1:2:void <clinit>():43:44 -> <clinit>
+    1:1:void <init>(java.lang.String,int):42:42 -> <init>
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis -> com.android.tools.r8.internal.t5:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set definiteReceiverAliases -> d
     com.android.tools.r8.ir.optimize.inliner.InliningIRProvider inliningIRProvider -> c
@@ -42199,13 +42579,13 @@
     44:44:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):78 -> a
     45:55:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):79:89 -> a
     56:57:boolean exceedsInstructionBudgetAfterIncrement(int):95:96 -> a
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo -> com.android.tools.r8.internal.s5:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerEligibilityInfo -> com.android.tools.r8.internal.u5:
     java.util.List callsReceiver -> a
     com.android.tools.r8.utils.OptionalBool returnsReceiver -> b
     boolean hasMonitorOnReceiver -> c
     boolean modifiesInstanceFields -> d
     1:5:void <init>(java.util.List,com.android.tools.r8.utils.OptionalBool,boolean,boolean):31:35 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.internal.t5:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverAnalysis -> com.android.tools.r8.internal.v5:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.code.IRCode code -> d
     com.android.tools.r8.ir.code.Value receiver -> e
@@ -42223,7 +42603,7 @@
     74:74:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):115:115 -> a
     75:75:com.android.tools.r8.utils.OptionalBool computeIsReceiverAlias(com.android.tools.r8.ir.code.Value):110:110 -> a
     1:2:com.android.tools.r8.utils.OptionalBool getOrComputeIsReceiverAlias(com.android.tools.r8.ir.code.Value):78:79 -> b
-com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.u5:
+com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet -> com.android.tools.r8.internal.w5:
     java.util.Set definiteReceiverAliases -> c
     java.util.Set maybeReceiverAliases -> d
     java.util.Set illegalReceiverAliases -> e
@@ -42252,7 +42632,7 @@
     5:5:boolean verifyReceiverSetsAreDisjoint():124 -> c
     6:6:boolean verifyReceiverSetsAreDisjoint():124:124 -> c
     1:1:java.util.List lambda$addDeferredAliasValidityCheck$0(com.android.tools.r8.ir.code.Value):84:84 -> d
-com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Ka:
+com.android.tools.r8.ir.optimize.classinliner.FieldValueHelper -> com.android.tools.r8.internal.Ta:
     com.android.tools.r8.ir.code.Instruction root -> d
     com.android.tools.r8.ir.code.Value defaultValue -> f
     com.android.tools.r8.graph.AppView appView -> e
@@ -42266,16 +42646,13 @@
     2:13:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.AppView):35:46 -> <init>
     1:8:void replaceValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):50:57 -> a
     9:45:com.android.tools.r8.ir.code.Value getOrCreateInValue(com.android.tools.r8.ir.code.BasicBlock):86:122 -> a
-    46:75:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):128:157 -> a
-    76:76:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    76:76:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157 -> a
-    77:80:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):157:160 -> a
-    81:81:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> a
-    81:81:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):160 -> a
-    82:85:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
+    46:78:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):128:160 -> a
+    79:79:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> a
+    79:79:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):160 -> a
+    80:83:com.android.tools.r8.ir.code.Value getValueDefinedInTheBlock(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):162:165 -> a
     1:3:com.android.tools.r8.ir.code.Value getValueForFieldRead(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Instruction):63:65 -> b
     4:16:com.android.tools.r8.ir.code.Value getOrCreateOutValue(com.android.tools.r8.ir.code.BasicBlock):69:81 -> b
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Fd:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor -> com.android.tools.r8.internal.Td:
     com.android.tools.r8.graph.DexProgramClass eligibleClass -> l
     java.util.Map directInlinees -> q
     java.util.List indirectInlinees -> r
@@ -42311,13 +42688,13 @@
     15:15:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     15:15:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):253 -> a
     16:20:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):257:261 -> a
-    21:21:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    21:21:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     21:21:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):262 -> a
     22:23:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):268:269 -> a
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
     24:24:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):269 -> a
     25:32:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):273:280 -> a
-    33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    33:33:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     33:33:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):281 -> a
     34:47:com.android.tools.r8.ir.code.InstructionOrPhi areInstanceUsersEligible(java.util.function.Supplier):287:300 -> a
     48:48:boolean com.android.tools.r8.graph.DexClassAndMethod.isLibraryMethod():0:0 -> a
@@ -42361,7 +42738,7 @@
     322:322:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):400:400 -> a
     323:329:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):438:444 -> a
     323:329:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):401 -> a
-    330:330:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):31:31 -> a
+    330:330:void com.android.tools.r8.ir.code.BasicBlockInstructionListIterator.add(java.lang.Object):33:33 -> a
     330:330:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):444 -> a
     330:330:boolean processInlining(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.function.Supplier,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):401 -> a
     331:336:void com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.replaceUsagesAsUnusedArgument(com.android.tools.r8.ir.code.IRCode):445:450 -> a
@@ -42511,28 +42888,28 @@
     1133:1140:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1261 -> a
     1141:1143:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1006:1008 -> a
     1141:1143:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
-    1144:1603:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:459 -> a
-    1144:1603:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1007 -> a
-    1144:1603:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
-    1604:1604:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1010:1010 -> a
-    1604:1604:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
-    1605:1629:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1270:1294 -> a
-    1630:1630:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1288:1288 -> a
-    1631:1631:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1322:1322 -> a
-    1632:1633:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1317:1318 -> a
-    1632:1633:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1323 -> a
-    1634:1636:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1325:1327 -> a
-    1637:1646:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1336:1345 -> a
-    1647:1647:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1341:1341 -> a
-    1648:1648:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1359:1359 -> a
-    1649:1650:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1359:1360 -> a
+    1144:1607:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:463 -> a
+    1144:1607:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1007 -> a
+    1144:1607:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
+    1608:1608:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.isEligibleIndirectVirtualMethodCall(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1010:1010 -> a
+    1608:1608:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1257 -> a
+    1609:1633:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1270:1294 -> a
+    1634:1634:boolean isEligibleParameterUsage(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1288:1288 -> a
+    1635:1635:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1322:1322 -> a
+    1636:1637:boolean com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor.exemptFromInstructionLimit(com.android.tools.r8.graph.ProgramMethod):1317:1318 -> a
+    1636:1637:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1323 -> a
+    1638:1640:void markSizeForInlining(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):1325:1327 -> a
+    1641:1650:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1336:1345 -> a
+    1651:1651:boolean isEligibleSingleTarget(com.android.tools.r8.graph.ProgramMethod):1341:1341 -> a
+    1652:1652:void lambda$removeInstruction$6(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):1359:1359 -> a
+    1653:1654:void removeInstruction(com.android.tools.r8.ir.code.Instruction):1359:1360 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass getEligibleClass():140:140 -> b
     2:2:boolean lambda$isEligibleParameterUsages$5(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,com.android.tools.r8.ir.code.InvokeMethod,java.util.function.Supplier):1206:1206 -> b
     1:1:java.util.List getIndirectInlinees():148:148 -> c
     1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInlinerReceiverSet getReceivers():152:152 -> d
     1:1:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isClassAndUsageEligible():211:211 -> e
     1:7:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():158:164 -> f
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> f
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> f
     8:8:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():164 -> f
     9:17:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():164:172 -> f
     18:28:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():168:178 -> f
@@ -42545,7 +42922,7 @@
     35:35:boolean com.android.tools.r8.ir.code.StaticGet.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):142 -> f
     35:35:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():181 -> f
     36:46:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():182:192 -> f
-    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> f
+    47:47:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> f
     47:47:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():192 -> f
     48:52:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():192:196 -> f
     53:53:com.android.tools.r8.ir.optimize.classinliner.ClassInliner$EligibilityStatus isInstanceEligible():189:189 -> f
@@ -42553,14 +42930,14 @@
     17:17:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):219:219 -> g
     17:17:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():599 -> g
     18:44:void removeAliasIntroducingInstructionsLinkedToEligibleInstance():600:626 -> g
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.internal.Dd:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind -> com.android.tools.r8.internal.Rd:
     com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind MAYBE -> b
     com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$AliasKind DEFINITE -> a
     1:2:void <clinit>():86:87 -> <clinit>
     1:1:void <init>(java.lang.String,int):85:85 -> <init>
-com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Ed:
+com.android.tools.r8.ir.optimize.classinliner.InlineCandidateProcessor$IllegalClassInlinerStateException -> com.android.tools.r8.internal.Sd:
     1:1:void <init>():1363:1363 -> <init>
-com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.Jz:
+com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer -> com.android.tools.r8.internal.cA:
     com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer INSTANCE -> a
     boolean $assertionsDisabled -> b
     1:3:void <clinit>():13:15 -> <clinit>
@@ -42568,41 +42945,41 @@
     1:1:com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer getInstance():20:20 -> a
     2:15:boolean switchCaseIsAlwaysHit(com.android.tools.r8.ir.code.Switch,int):24:37 -> a
     1:12:boolean switchCaseIsUnreachable(com.android.tools.r8.ir.code.Switch,int):41:52 -> b
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.z9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData -> com.android.tools.r8.internal.I9:
     1:1:void <init>():24:24 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.v9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData -> com.android.tools.r8.internal.E9:
     1:1:void <init>():52:52 -> <init>
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData asEnumFieldKnownData() -> a
     boolean isUnknown() -> b
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.w9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData -> com.android.tools.r8.internal.F9:
     java.util.Map mapping -> a
     1:2:void <init>(java.util.Map):88:89 -> <init>
     1:1:com.android.tools.r8.ir.analysis.value.AbstractValue getData(com.android.tools.r8.graph.DexField):108:108 -> a
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData asEnumFieldMappingData() -> c
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.x9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldOrdinalData -> com.android.tools.r8.internal.G9:
     1:1:void <init>():73:73 -> <init>
     boolean isMapping() -> d
     boolean isOrdinal() -> e
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.y9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData -> com.android.tools.r8.internal.H9:
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData INSTANCE -> a
     1:1:void <clinit>():38:38 -> <clinit>
     1:1:void <init>():44:44 -> <init>
     boolean isUnknown() -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldUnknownData getInstance():41:41 -> c
-com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap -> com.android.tools.r8.internal.A9:
+com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap -> com.android.tools.r8.internal.J9:
     com.android.tools.r8.com.google.common.collect.ImmutableMap instanceFieldMap -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.ImmutableMap):17:18 -> <init>
     1:3:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldKnownData getInstanceFieldData(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):23:25 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.G9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer -> com.android.tools.r8.internal.P9:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumUnboxingCandidatesInfo -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -42649,243 +43026,243 @@
     287:288:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeFieldInstruction(com.android.tools.r8.ir.code.FieldInstruction,com.android.tools.r8.ir.code.IRCode):204:205 -> a
     287:288:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):173 -> a
     289:289:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):161:161 -> a
-    290:298:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):254:262 -> a
+    290:298:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):255:263 -> a
     290:298:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):161 -> a
-    299:299:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    299:299:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):262 -> a
+    299:299:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    299:299:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):263 -> a
     299:299:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):161 -> a
-    300:307:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):262:269 -> a
+    300:307:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):263:270 -> a
     300:307:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):161 -> a
-    308:308:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):290:290 -> a
-    308:308:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):269 -> a
+    308:308:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.isUnboxableNameMethod(com.android.tools.r8.graph.DexMethod):294:294 -> a
+    308:308:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):270 -> a
     308:308:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):161 -> a
-    309:318:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set):272:281 -> a
-    309:318:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):161 -> a
-    319:319:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164:164 -> a
-    320:320:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):230:230 -> a
-    320:320:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
-    321:321:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):130:130 -> a
-    321:321:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):230 -> a
-    321:321:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
-    322:324:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):242:244 -> a
-    322:324:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):234 -> a
-    322:324:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
-    325:325:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):243:243 -> a
-    325:325:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):234 -> a
-    325:325:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
-    326:329:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):235:238 -> a
-    326:329:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
-    330:345:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):178:193 -> a
-    346:346:void addRequiredNameData(com.android.tools.r8.graph.DexType):285:285 -> a
-    347:357:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):296:306 -> a
-    358:358:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):130:130 -> a
-    358:358:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):306 -> a
-    359:370:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):308:319 -> a
-    371:371:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):326:326 -> a
-    372:398:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):721:747 -> a
-    372:398:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    399:399:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():45:45 -> a
-    399:399:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):747 -> a
-    399:399:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    400:413:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):747:760 -> a
-    400:413:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    414:414:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    414:414:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):762 -> a
-    414:414:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    415:417:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):763:765 -> a
-    415:417:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    418:418:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    418:418:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):765 -> a
-    418:418:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    419:441:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):765:787 -> a
-    419:441:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    442:466:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):785:809 -> a
-    442:466:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    467:492:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):796:821 -> a
-    467:492:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    493:545:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):0:52 -> a
-    493:545:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):821 -> a
-    493:545:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    546:556:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):823:833 -> a
-    546:556:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    557:557:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    557:557:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):836 -> a
-    557:557:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    558:583:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):837:862 -> a
-    558:583:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    584:584:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    584:584:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):865 -> a
-    584:584:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    585:585:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):866:866 -> a
-    585:585:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    586:588:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):242:244 -> a
-    586:588:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):866 -> a
-    586:588:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    589:589:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):243:243 -> a
-    589:589:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):866 -> a
-    589:589:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    590:592:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):867:869 -> a
-    590:592:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    593:593:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> a
-    593:593:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):872 -> a
-    593:593:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    594:623:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):874:903 -> a
-    594:623:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    624:624:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    624:624:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):906 -> a
-    624:624:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    625:638:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):907:920 -> a
-    625:638:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):327 -> a
-    639:653:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):328:342 -> a
-    654:655:void updateKeepInfo(java.util.Set):420:421 -> a
-    656:1100:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):0:444 -> a
-    656:1100:void updateKeepInfo(java.util.Set):421 -> a
-    1101:1101:void lambda$updateKeepInfo$0(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):421:421 -> a
-    1102:1105:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():425:428 -> a
-    1102:1105:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):350 -> a
-    1106:1114:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1007:1015 -> a
-    1106:1114:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():429 -> a
-    1106:1114:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):350 -> a
-    1115:1130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1010:1025 -> a
-    1115:1130:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():429 -> a
-    1115:1130:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):350 -> a
-    1131:1142:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):354:365 -> a
-    1143:1143:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator.builder(com.android.tools.r8.graph.AppView):55:55 -> a
-    1143:1143:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):366 -> a
-    1144:1155:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):366:377 -> a
-    1156:1744:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):0:588 -> a
-    1156:1744:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):377 -> a
-    1745:1745:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):386:386 -> a
-    1745:1745:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):378 -> a
-    1746:1747:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):379:380 -> a
-    1748:1749:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):440:441 -> a
-    1750:1757:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):925:932 -> a
-    1750:1757:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1758:1763:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):971:976 -> a
-    1758:1763:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1758:1763:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1764:1764:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
-    1764:1764:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):977 -> a
-    1764:1764:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1764:1764:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1765:1765:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):979:979 -> a
-    1765:1765:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1765:1765:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1766:1766:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():36:36 -> a
-    1766:1766:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):979 -> a
-    1766:1766:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1766:1766:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1767:1774:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):979:986 -> a
-    1767:1774:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1767:1774:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1775:1775:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):984:984 -> a
-    1775:1775:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1775:1775:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1776:1781:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):983:988 -> a
-    1776:1781:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1776:1781:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1782:1782:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():36:36 -> a
-    1782:1782:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):989 -> a
-    1782:1782:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1782:1782:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1783:1783:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):993:993 -> a
-    1783:1783:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1783:1783:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1784:1784:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
-    1784:1784:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):994 -> a
-    1784:1784:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1784:1784:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1785:1786:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):996:997 -> a
-    1785:1786:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1785:1786:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1787:1787:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
-    1787:1787:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):998 -> a
-    1787:1787:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1787:1787:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1788:1789:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):1000:1001 -> a
-    1788:1789:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1788:1789:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1790:1790:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
-    1790:1790:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):1003 -> a
-    1790:1790:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):934 -> a
-    1790:1790:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1791:1791:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939:939 -> a
-    1791:1791:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1792:1792:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    1792:1792:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):940 -> a
-    1792:1792:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1793:1810:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):940:957 -> a
-    1793:1810:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):442 -> a
-    1811:1817:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):443:449 -> a
-    1818:1818:void analyzeAccessibility():457:457 -> a
-    1819:1825:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):469:475 -> a
-    1819:1825:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):459 -> a
-    1826:1826:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.constraintForEnumUnboxing(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry):489:489 -> a
-    1826:1826:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):477 -> a
-    1826:1826:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):459 -> a
-    1827:1828:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):478:479 -> a
-    1827:1828:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):459 -> a
-    1829:1832:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):460:463 -> a
-    1833:1834:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason):1029:1030 -> a
-    1835:1836:void synthesizeUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):1045:1046 -> a
+    309:321:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeConstClass(com.android.tools.r8.ir.code.ConstClass,java.util.Set,com.android.tools.r8.graph.ProgramMethod):273:285 -> a
+    309:321:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):161 -> a
+    322:322:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164:164 -> a
+    323:323:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):230:230 -> a
+    323:323:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
+    324:324:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):130:130 -> a
+    324:324:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):230 -> a
+    324:324:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
+    325:327:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):242:244 -> a
+    325:327:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):234 -> a
+    325:327:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
+    328:328:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):243:243 -> a
+    328:328:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):234 -> a
+    328:328:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
+    329:332:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeCheckCast(com.android.tools.r8.ir.code.CheckCast,java.util.Set):235:238 -> a
+    329:332:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):164 -> a
+    333:348:void analyzeEnums(com.android.tools.r8.ir.code.IRCode):178:193 -> a
+    349:349:void addRequiredNameData(com.android.tools.r8.graph.DexType):289:289 -> a
+    350:360:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):300:310 -> a
+    361:361:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.ir.optimize.enums.EnumUnboxer.getEnumUnboxingCandidateOrNull(com.android.tools.r8.graph.DexType):130:130 -> a
+    361:361:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):310 -> a
+    362:373:void addNullDependencies(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):312:323 -> a
+    374:374:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):330:330 -> a
+    375:401:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):726:752 -> a
+    375:401:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    402:402:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.graph.DexMethod.getParameters():45:45 -> a
+    402:402:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):752 -> a
+    402:402:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    403:416:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):752:765 -> a
+    403:416:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    417:417:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    417:417:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):767 -> a
+    417:417:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    418:420:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):768:770 -> a
+    418:420:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    421:421:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    421:421:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):770 -> a
+    421:421:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    422:444:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):770:792 -> a
+    422:444:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    445:469:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):790:814 -> a
+    445:469:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    470:495:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):801:826 -> a
+    470:495:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    496:548:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):0:52 -> a
+    496:548:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):826 -> a
+    496:548:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    549:559:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):828:838 -> a
+    549:559:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    560:560:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    560:560:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):841 -> a
+    560:560:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    561:586:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):842:867 -> a
+    561:586:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    587:587:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    587:587:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):870 -> a
+    587:587:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    588:588:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):871:871 -> a
+    588:588:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    589:591:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):242:244 -> a
+    589:591:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):871 -> a
+    589:591:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    592:592:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxer.allowCheckCast(com.android.tools.r8.ir.code.CheckCast):243:243 -> a
+    592:592:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):871 -> a
+    592:592:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    593:595:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):872:874 -> a
+    593:595:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    596:596:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> a
+    596:596:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):877 -> a
+    596:596:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    597:626:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):879:908 -> a
+    597:626:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    627:627:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
+    627:627:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):911 -> a
+    627:627:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    628:641:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason com.android.tools.r8.ir.optimize.enums.EnumUnboxer.instructionAllowEnumUnboxing(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.code.Value):912:925 -> a
+    628:641:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):331 -> a
+    642:656:com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason validateEnumUsages(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexProgramClass):332:346 -> a
+    657:658:void updateKeepInfo(java.util.Set):425:426 -> a
+    659:1103:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):0:444 -> a
+    659:1103:void updateKeepInfo(java.util.Set):426 -> a
+    1104:1104:void lambda$updateKeepInfo$0(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):426:426 -> a
+    1105:1108:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():430:433 -> a
+    1105:1108:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):354 -> a
+    1109:1117:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1012:1020 -> a
+    1109:1117:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():434 -> a
+    1109:1117:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):354 -> a
+    1118:1133:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.reportEnumsAnalysis():1015:1030 -> a
+    1118:1133:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap com.android.tools.r8.ir.optimize.enums.EnumUnboxer.finishAnalysis():434 -> a
+    1118:1133:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):354 -> a
+    1134:1145:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):358:369 -> a
+    1146:1146:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator.builder(com.android.tools.r8.graph.AppView):55:55 -> a
+    1146:1146:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):370 -> a
+    1147:1159:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):370:382 -> a
+    1160:1756:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):0:596 -> a
+    1160:1756:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):382 -> a
+    1757:1757:void com.android.tools.r8.ir.optimize.enums.EnumUnboxer.updateOptimizationInfos(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):391:391 -> a
+    1757:1757:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):383 -> a
+    1758:1759:void unboxEnums(com.android.tools.r8.ir.conversion.PostMethodProcessor$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed):384:385 -> a
+    1760:1761:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):445:446 -> a
+    1762:1769:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):930:937 -> a
+    1762:1769:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1770:1775:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):976:981 -> a
+    1770:1775:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1770:1775:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1776:1776:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    1776:1776:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):982 -> a
+    1776:1776:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1776:1776:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1777:1777:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):984:984 -> a
+    1777:1777:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1777:1777:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1778:1778:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():36:36 -> a
+    1778:1778:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):984 -> a
+    1778:1778:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1778:1778:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1779:1786:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):984:991 -> a
+    1779:1786:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1779:1786:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1787:1787:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):989:989 -> a
+    1787:1787:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1787:1787:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1788:1793:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):988:993 -> a
+    1788:1793:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1788:1793:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1794:1794:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isZero():36:36 -> a
+    1794:1794:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):994 -> a
+    1794:1794:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1794:1794:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1795:1795:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):998:998 -> a
+    1795:1795:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1795:1795:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1796:1796:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    1796:1796:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):999 -> a
+    1796:1796:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1796:1796:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1797:1798:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):1001:1002 -> a
+    1797:1798:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1797:1798:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1799:1799:boolean com.android.tools.r8.ir.analysis.value.ObjectState.isEnumValuesObjectState():0:0 -> a
+    1799:1799:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):1003 -> a
+    1799:1799:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1799:1799:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1800:1801:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):1005:1006 -> a
+    1800:1801:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1800:1801:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1802:1802:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.analysis.value.ObjectState.empty():22:22 -> a
+    1802:1802:com.android.tools.r8.ir.analysis.value.ObjectState com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumInstanceObjectState(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):1008 -> a
+    1802:1802:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):939 -> a
+    1802:1802:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1803:1803:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):944:944 -> a
+    1803:1803:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1804:1804:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    1804:1804:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):945 -> a
+    1804:1804:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1805:1822:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData com.android.tools.r8.ir.optimize.enums.EnumUnboxer.computeEnumFieldData(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexProgramClass):945:962 -> a
+    1805:1822:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):447 -> a
+    1823:1829:void lambda$analyzeFields$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,java.util.Set):448:454 -> a
+    1830:1830:void analyzeAccessibility():462:462 -> a
+    1831:1837:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):474:480 -> a
+    1831:1837:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):464 -> a
+    1838:1838:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.constraintForEnumUnboxing(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry):494:494 -> a
+    1838:1838:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):482 -> a
+    1838:1838:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):464 -> a
+    1839:1840:com.android.tools.r8.ir.optimize.Inliner$Constraint com.android.tools.r8.ir.optimize.enums.EnumUnboxer.analyzeAccessibilityInClass(com.android.tools.r8.graph.DexProgramClass):483:484 -> a
+    1839:1840:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):464 -> a
+    1841:1844:void lambda$analyzeAccessibility$2(com.android.tools.r8.graph.DexProgramClass):465:468 -> a
+    1845:1846:void reportFailure(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason):1034:1035 -> a
+    1847:1848:void synthesizeUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):1050:1051 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):80:80 -> b
-    2:17:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap analyzeFields():436:451 -> b
-    18:39:void lambda$analyzeInitializers$3(com.android.tools.r8.graph.DexProgramClass):691:712 -> b
-    40:43:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):1037:1040 -> b
-    1:1:void analyzeInitializers():688:688 -> c
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.D9:
+    2:17:com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap analyzeFields():441:456 -> b
+    18:39:void lambda$analyzeInitializers$3(com.android.tools.r8.graph.DexProgramClass):696:717 -> b
+    40:43:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):1042:1045 -> b
+    1:1:void analyzeInitializers():693:693 -> c
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$1 -> com.android.tools.r8.internal.M9:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():389:389 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):389:389 -> <init>
-    1:1:void fixup(com.android.tools.r8.graph.DexEncodedField):392:392 -> a
+    1:1:void <clinit>():394:394 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer):394:394 -> <init>
+    1:1:void fixup(com.android.tools.r8.graph.DexEncodedField):397:397 -> a
     2:2:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isMutableFieldOptimizationInfo():0:0 -> a
-    2:2:void fixup(com.android.tools.r8.graph.DexEncodedField):393 -> a
-    3:7:void fixup(com.android.tools.r8.graph.DexEncodedField):395:399 -> a
+    2:2:void fixup(com.android.tools.r8.graph.DexEncodedField):398 -> a
+    3:7:void fixup(com.android.tools.r8.graph.DexEncodedField):400:404 -> a
     8:8:boolean com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo.isDefaultFieldOptimizationInfo():0:0 -> a
-    8:8:void fixup(com.android.tools.r8.graph.DexEncodedField):399 -> a
-    9:9:void fixup(com.android.tools.r8.graph.DexEncodedField):399:399 -> a
-    10:18:void fixup(com.android.tools.r8.graph.DexEncodedMethod):405:413 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.E9:
+    8:8:void fixup(com.android.tools.r8.graph.DexEncodedField):404 -> a
+    9:9:void fixup(com.android.tools.r8.graph.DexEncodedField):404:404 -> a
+    10:18:void fixup(com.android.tools.r8.graph.DexEncodedMethod):410:418 -> a
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$EnumAccessibilityUseRegistry -> com.android.tools.r8.internal.N9:
     com.android.tools.r8.ir.optimize.Inliner$Constraint constraint -> e
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer this$0 -> f
     boolean $assertionsDisabled -> c
     com.android.tools.r8.graph.ProgramMethod context -> d
-    1:1:void <clinit>():492:492 -> <clinit>
-    1:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.DexItemFactory):497:498 -> <init>
-    1:4:com.android.tools.r8.ir.optimize.Inliner$Constraint computeConstraint(com.android.tools.r8.graph.ProgramMethod):502:505 -> a
-    5:30:com.android.tools.r8.ir.optimize.Inliner$Constraint deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):509:534 -> a
-    31:44:void registerTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMember):599:612 -> a
-    45:45:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):617:617 -> a
-    46:56:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):627:637 -> a
-    57:57:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):634:634 -> a
-    58:59:void registerCallSite(com.android.tools.r8.graph.DexCallSite):655:656 -> a
-    60:60:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):668:668 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):578:578 -> b
-    2:7:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):582:587 -> b
+    1:1:void <clinit>():497:497 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.ir.optimize.enums.EnumUnboxer,com.android.tools.r8.graph.DexItemFactory):502:503 -> <init>
+    1:4:com.android.tools.r8.ir.optimize.Inliner$Constraint computeConstraint(com.android.tools.r8.graph.ProgramMethod):507:510 -> a
+    5:30:com.android.tools.r8.ir.optimize.Inliner$Constraint deriveConstraint(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AccessFlags):514:539 -> a
+    31:44:void registerTarget(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMember):604:617 -> a
+    45:45:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):622:622 -> a
+    46:56:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):632:642 -> a
+    57:57:void registerSingleTargetInvoke(com.android.tools.r8.graph.DexMethod,java.util.function.Predicate):639:639 -> a
+    58:59:void registerCallSite(com.android.tools.r8.graph.DexCallSite):660:661 -> a
+    60:60:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):673:673 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):583:583 -> b
+    2:7:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):587:592 -> b
     8:517:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):0:509 -> b
-    8:517:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):587 -> b
-    518:523:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):588:593 -> b
-    524:524:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):592:592 -> b
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):622:622 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):673:673 -> c
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):558:558 -> d
-    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):646:646 -> d
-    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):563:563 -> e
-    2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):573:573 -> e
-    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):678:678 -> e
-    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):568:568 -> f
-    1:10:void registerTypeReference(com.android.tools.r8.graph.DexType):539:548 -> g
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> g
-    11:11:void registerTypeReference(com.android.tools.r8.graph.DexType):548 -> g
-    12:15:void registerTypeReference(com.android.tools.r8.graph.DexType):550:553 -> g
-    16:16:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):683:683 -> g
-    1:1:void registerFieldInstruction(com.android.tools.r8.graph.DexField):660:660 -> i
+    8:517:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):592 -> b
+    518:523:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):593:598 -> b
+    524:524:void registerVirtualInvoke(com.android.tools.r8.graph.DexMethod,boolean):597:597 -> b
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):563:563 -> c
+    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):627:627 -> c
+    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):678:678 -> c
+    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):568:568 -> d
+    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):651:651 -> d
+    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):573:573 -> e
+    2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):578:578 -> e
+    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):683:683 -> e
+    1:10:void registerTypeReference(com.android.tools.r8.graph.DexType):544:553 -> f
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> f
+    11:11:void registerTypeReference(com.android.tools.r8.graph.DexType):553 -> f
+    12:15:void registerTypeReference(com.android.tools.r8.graph.DexType):555:558 -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):688:688 -> g
+    1:1:void registerFieldInstruction(com.android.tools.r8.graph.DexField):665:665 -> i
     2:227:com.android.tools.r8.graph.FieldResolutionResult com.android.tools.r8.graph.AppInfo.resolveField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):0:225 -> i
-    2:227:void registerFieldInstruction(com.android.tools.r8.graph.DexField):660 -> i
-    228:229:void registerFieldInstruction(com.android.tools.r8.graph.DexField):662:663 -> i
-    230:230:void registerFieldInstruction(com.android.tools.r8.graph.DexField):661:661 -> i
-com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.internal.F9:
+    2:227:void registerFieldInstruction(com.android.tools.r8.graph.DexField):665 -> i
+    228:229:void registerFieldInstruction(com.android.tools.r8.graph.DexField):667:668 -> i
+    230:230:void registerFieldInstruction(com.android.tools.r8.graph.DexField):666:666 -> i
+com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason -> com.android.tools.r8.internal.O9:
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason MISSING_INSTANCE_FIELD_DATA -> z
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason UNSUPPORTED_LIBRARY_CALL -> x
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason VALUES_INVOKE -> v
@@ -42921,9 +43298,9 @@
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ANNOTATION -> c
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason INVALID_FIELD_PUT -> B
     com.android.tools.r8.ir.optimize.enums.EnumUnboxer$Reason ELIGIBLE -> a
-    1:35:void <clinit>():1051:1085 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1050:1050 -> <init>
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.H9:
+    1:35:void <clinit>():1056:1090 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1055:1055 -> <init>
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis -> com.android.tools.r8.internal.Q9:
     com.android.tools.r8.graph.DexItemFactory factory -> d
     com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection enumToUnboxCandidates -> e
     com.android.tools.r8.graph.AppView appView -> b
@@ -42943,7 +43320,7 @@
     30:30:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():42:42 -> a
     31:31:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():101:101 -> a
     31:31:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
-    32:32:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
+    32:32:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
     32:32:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():102 -> a
     32:32:com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection findCandidates():45 -> a
     33:33:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateAnalysis.removeEnumsInAnnotations():103:103 -> a
@@ -42962,7 +43339,7 @@
     55:57:void removePinnedIfNotHolder(com.android.tools.r8.graph.DexMember,com.android.tools.r8.graph.DexType):143 -> a
     58:60:void removePinnedCandidate(com.android.tools.r8.graph.DexType):148:150 -> a
     1:4:void removePinnedCandidates():127:130 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.J9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection -> com.android.tools.r8.internal.S9:
     java.util.Map enumTypeToInfo -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():20:20 -> <clinit>
@@ -42982,7 +43359,7 @@
     2:2:com.android.tools.r8.com.google.common.collect.ImmutableSet candidates():42:42 -> c
     1:1:void clear():104:104 -> d
     1:1:boolean isEmpty():38:38 -> e
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.I9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo -> com.android.tools.r8.internal.R9:
     com.android.tools.r8.utils.collections.ProgramMethodSet methodDependencies -> c
     java.util.Set requiredInstanceFieldData -> d
     com.android.tools.r8.graph.DexProgramClass enumClass -> b
@@ -42996,7 +43373,7 @@
     4:4:void addRequiredInstanceFieldData(com.android.tools.r8.graph.DexField):127:127 -> a
     1:1:com.android.tools.r8.utils.collections.ProgramMethodSet access$100(com.android.tools.r8.ir.optimize.enums.EnumUnboxingCandidateInfoCollection$EnumUnboxingCandidateInfo):107:107 -> b
     2:2:java.util.Set getRequiredInstanceFieldData():131:131 -> b
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.P9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens -> com.android.tools.r8.internal.Y9:
     boolean $assertionsDisabled -> m
     java.util.Map prototypeChangesPerMethod -> n
     java.util.Set unboxedEnums -> o
@@ -43005,7 +43382,7 @@
     1:2:com.android.tools.r8.graph.RewrittenPrototypeDescription internalDescribePrototypeChanges(com.android.tools.r8.graph.RewrittenPrototypeDescription,com.android.tools.r8.graph.DexMethod):56:57 -> a
     1:4:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):63:66 -> b
     1:1:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder enumUnboxingLensBuilder():72:72 -> l
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.O9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder -> com.android.tools.r8.internal.X9:
     java.util.Map typeMap -> b
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> c
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> d
@@ -43018,259 +43395,264 @@
     32:34:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):139 -> a
     35:35:void move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean,int):136:136 -> a
     36:50:com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens build(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.GraphLens,java.util.Set):144:158 -> a
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Q9:
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter -> com.android.tools.r8.internal.Z9:
     com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator relocator -> g
-    com.android.tools.r8.graph.DexMethod zeroCheckMessageMethod -> o
-    com.android.tools.r8.graph.DexMethod zeroCheckMethod -> n
+    com.android.tools.r8.graph.DexMethod zeroCheckMethod -> o
+    com.android.tools.r8.graph.DexMethod valuesUtilityMethod -> n
     com.android.tools.r8.graph.DexItemFactory factory -> d
-    com.android.tools.r8.graph.DexMethod valuesUtilityMethod -> m
-    com.android.tools.r8.graph.DexMethod compareToUtilityMethod -> l
-    com.android.tools.r8.graph.DexMethod equalsUtilityMethod -> k
+    com.android.tools.r8.graph.DexMethod compareToUtilityMethod -> m
+    com.android.tools.r8.graph.DexMethod equalsUtilityMethod -> l
+    com.android.tools.r8.graph.DexMethod ordinalUtilityMethod -> k
     com.android.tools.r8.graph.AppView appView -> c
-    com.android.tools.r8.graph.DexMethod ordinalUtilityMethod -> j
     com.android.tools.r8.graph.EnumValueInfoMapCollection enumsToUnbox -> e
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap unboxedEnumsInstanceFieldData -> f
+    com.android.tools.r8.graph.GraphLens$NestedGraphLens enumUnboxingLens -> h
     com.android.tools.r8.cf.CfVersion REQUIRED_CLASS_FILE_VERSION -> a
-    java.util.Map utilityFields -> i
+    java.util.Map utilityMethods -> i
+    java.util.Map utilityFields -> j
     boolean $assertionsDisabled -> b
-    java.util.Map utilityMethods -> h
-    1:4:void <clinit>():70:73 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):95:95 -> <init>
-    2:33:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):81:112 -> <init>
-    34:41:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):110:117 -> <init>
-    42:49:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):115:122 -> <init>
-    50:58:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):120:128 -> <init>
-    59:67:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):126:134 -> <init>
-    68:75:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):132:139 -> <init>
-    76:76:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):137:137 -> <init>
-    1:1:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumsToUnbox():144:144 -> a
-    2:11:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):150:159 -> a
-    12:16:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):338:342 -> a
-    12:16:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):160 -> a
-    17:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.insertConstZero(com.android.tools.r8.ir.code.IRCode):355:359 -> a
-    17:21:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):344 -> a
-    17:21:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):160 -> a
-    22:22:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):346:346 -> a
-    22:22:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):160 -> a
-    23:56:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):161:194 -> a
-    57:61:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):186:190 -> a
-    62:62:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):188:188 -> a
-    63:100:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):173:210 -> a
-    101:101:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    101:101:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):210 -> a
-    102:129:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):211:238 -> a
-    130:148:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):236:254 -> a
-    149:149:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    149:149:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):262 -> a
-    150:162:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):263:275 -> a
-    163:167:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesField(com.android.tools.r8.graph.DexType):416:416 -> a
-    163:167:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):277 -> a
-    168:168:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):278:278 -> a
-    169:173:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesMethod(com.android.tools.r8.graph.DexType):433:433 -> a
-    169:173:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):279 -> a
-    174:179:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):280:285 -> a
-    180:180:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    180:180:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):284 -> a
-    181:189:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):286:294 -> a
-    190:190:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
-    190:190:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):294 -> a
-    191:192:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):295:296 -> a
-    193:193:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
-    193:193:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):301 -> a
-    194:201:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):302:309 -> a
-    202:202:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):308:308 -> a
-    203:203:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    203:203:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):307 -> a
-    204:216:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):310:322 -> a
-    217:230:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.code.ArrayAccess):496:509 -> a
-    217:230:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):323 -> a
-    231:235:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):325:329 -> a
-    236:243:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):384:391 -> a
-    236:243:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):329 -> a
-    244:244:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):389:389 -> a
-    244:244:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):329 -> a
-    245:245:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):333:333 -> a
-    246:246:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):282:282 -> a
-    247:251:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.computeValuesEncodedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,int):441:445 -> a
-    247:251:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):282 -> a
-    252:258:com.android.tools.r8.graph.DexMethod computeInstanceFieldMethod(com.android.tools.r8.graph.DexField):363:369 -> a
-    259:259:com.android.tools.r8.graph.DexEncodedMethod lambda$computeInstanceFieldMethod$8(com.android.tools.r8.graph.DexMethod):366:366 -> a
-    260:263:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod,java.util.function.Function):377:380 -> a
-    264:264:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):396:396 -> a
-    265:265:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
-    265:265:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):397 -> a
-    266:268:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):398:400 -> a
-    269:273:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):404:408 -> a
-    274:274:java.lang.String compatibleName(com.android.tools.r8.graph.DexType):412:412 -> a
-    275:286:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):449:460 -> a
-    287:291:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):458:462 -> a
-    292:292:com.android.tools.r8.graph.DexEncodedMethod lambda$computeInstanceFieldUtilityMethod$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):463:463 -> a
-    293:293:com.android.tools.r8.graph.DexEncodedMethod lambda$computeStringValueOfUtilityMethod$10(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexMethod):480:480 -> a
-    294:316:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):516:538 -> a
-    317:317:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):524:524 -> a
-    318:318:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    318:318:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):524 -> a
-    319:323:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):524:528 -> a
-    324:324:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):534:534 -> a
-    325:325:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    325:325:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):534 -> a
-    326:328:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):534:536 -> a
-    329:341:java.util.Map triageEncodedMembers(java.util.Collection):543:555 -> a
-    342:342:int lambda$triageEncodedMembers$15(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.graph.DexEncodedMember):555:555 -> a
-    343:356:com.android.tools.r8.graph.DexEncodedMethod synthesizeInstanceFieldMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):562:575 -> a
-    357:360:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):579:582 -> a
-    357:360:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):491 -> a
-    361:374:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):580:593 -> a
-    361:374:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):491 -> a
-    375:375:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):635:635 -> a
-    376:376:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizedMethodAccessFlags(boolean):651:651 -> a
-    376:376:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):637 -> a
-    377:379:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):638:640 -> a
-    380:380:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
-    380:380:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):640 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):174:174 -> b
-    2:7:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):423:428 -> b
+    com.android.tools.r8.graph.DexMethod zeroCheckMessageMethod -> p
+    1:4:void <clinit>():72:75 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):98:98 -> <init>
+    2:33:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):84:115 -> <init>
+    34:41:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):113:120 -> <init>
+    42:49:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):118:125 -> <init>
+    50:58:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):123:131 -> <init>
+    59:67:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):129:137 -> <init>
+    68:75:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):135:142 -> <init>
+    76:76:void <init>(com.android.tools.r8.graph.AppView,java.util.Set,com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldDataMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator):140:140 -> <init>
+    1:1:void setEnumUnboxingLens(com.android.tools.r8.graph.GraphLens$NestedGraphLens):147:147 -> a
+    2:2:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumsToUnbox():151:151 -> a
+    3:13:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):157:167 -> a
+    14:18:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):370:374 -> a
+    14:18:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):168 -> a
+    19:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.insertConstZero(com.android.tools.r8.ir.code.IRCode):387:391 -> a
+    19:23:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):376 -> a
+    19:23:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):168 -> a
+    24:24:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.fixNullsInBlockPhis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.Value):378:378 -> a
+    24:24:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):168 -> a
+    25:53:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):169:197 -> a
+    54:57:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):363:366 -> a
+    54:57:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):198 -> a
+    58:58:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):365:365 -> a
+    58:58:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):198 -> a
+    59:60:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):200:201 -> a
+    61:61:boolean com.android.tools.r8.ir.code.Instruction.isInvokeSuper():0:0 -> a
+    61:61:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):205 -> a
+    62:65:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):363:366 -> a
+    62:65:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):206 -> a
+    66:66:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.rewriteNameMethod(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethodWithReceiver,com.android.tools.r8.graph.DexType):365:365 -> a
+    66:66:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):206 -> a
+    67:69:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):209:211 -> a
+    70:143:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):186:259 -> a
+    144:162:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):257:275 -> a
+    163:163:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    163:163:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):283 -> a
+    164:176:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):284:296 -> a
+    177:181:com.android.tools.r8.graph.DexField com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesField(com.android.tools.r8.graph.DexType):448:448 -> a
+    177:181:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):298 -> a
+    182:182:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):299:299 -> a
+    183:187:com.android.tools.r8.graph.DexMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.createValuesMethod(com.android.tools.r8.graph.DexType):465:465 -> a
+    183:187:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):300 -> a
+    188:193:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):301:306 -> a
+    194:204:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):305:315 -> a
+    205:205:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
+    205:205:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):315 -> a
+    206:207:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):316:317 -> a
+    208:208:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
+    208:208:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):322 -> a
+    209:216:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):323:330 -> a
+    217:217:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):329:329 -> a
+    218:233:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):328:343 -> a
+    234:247:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.getEnumTypeOrNull(com.android.tools.r8.ir.code.ArrayAccess):528:541 -> a
+    234:247:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):344 -> a
+    248:255:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):346:353 -> a
+    256:263:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):416:423 -> a
+    256:263:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):353 -> a
+    264:264:boolean com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.validateArrayAccess(com.android.tools.r8.ir.code.ArrayAccess):421:421 -> a
+    264:264:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):353 -> a
+    265:265:java.util.Set rewriteCode(com.android.tools.r8.ir.code.IRCode):357:357 -> a
+    266:266:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):303:303 -> a
+    267:271:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.computeValuesEncodedMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexField,int):473:477 -> a
+    267:271:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$7(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.graph.DexMethod):303 -> a
+    272:278:com.android.tools.r8.graph.DexMethod computeInstanceFieldMethod(com.android.tools.r8.graph.DexField):395:401 -> a
+    279:279:com.android.tools.r8.graph.DexEncodedMethod lambda$computeInstanceFieldMethod$8(com.android.tools.r8.graph.DexMethod):398:398 -> a
+    280:283:void replaceEnumInvoke(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexMethod,java.util.function.Function):409:412 -> a
+    284:284:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):428:428 -> a
+    285:285:boolean com.android.tools.r8.ir.analysis.type.TypeElement.isInt():0:0 -> a
+    285:285:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):429 -> a
+    286:288:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.code.Value,java.util.Map):430:432 -> a
+    289:293:com.android.tools.r8.graph.DexType getEnumTypeOrNull(com.android.tools.r8.ir.analysis.type.TypeElement):436:440 -> a
+    294:294:java.lang.String compatibleName(com.android.tools.r8.graph.DexType):444:444 -> a
+    295:306:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):481:492 -> a
+    307:311:com.android.tools.r8.graph.DexMethod computeInstanceFieldUtilityMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):490:494 -> a
+    312:312:com.android.tools.r8.graph.DexEncodedMethod lambda$computeInstanceFieldUtilityMethod$9(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexMethod):495:495 -> a
+    313:313:com.android.tools.r8.graph.DexEncodedMethod lambda$computeStringValueOfUtilityMethod$10(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexMethod):512:512 -> a
+    314:336:void synthesizeEnumUnboxingUtilityMethods(com.android.tools.r8.ir.conversion.IRConverter,java.util.concurrent.ExecutorService):548:570 -> a
+    337:337:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):556:556 -> a
+    338:338:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    338:338:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):556 -> a
+    339:343:void lambda$synthesizeEnumUnboxingUtilityMethods$12(com.android.tools.r8.utils.collections.SortedProgramMethodSet,com.android.tools.r8.graph.DexType,java.util.List):556:560 -> a
+    344:344:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):566:566 -> a
+    345:345:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    345:345:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):566 -> a
+    346:348:void lambda$synthesizeEnumUnboxingUtilityMethods$13(com.android.tools.r8.graph.DexType,java.util.List):566:568 -> a
+    349:361:java.util.Map triageEncodedMembers(java.util.Collection):575:587 -> a
+    362:362:int lambda$triageEncodedMembers$15(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.graph.DexEncodedMember):587:587 -> a
+    363:376:com.android.tools.r8.graph.DexEncodedMethod synthesizeInstanceFieldMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.analysis.value.AbstractValue):594:607 -> a
+    377:380:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):611:614 -> a
+    377:380:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):523 -> a
+    381:394:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValueOfUtilityMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexType):612:625 -> a
+    381:394:com.android.tools.r8.graph.DexEncodedMethod lambda$computeValueOfUtilityMethod$11(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):523 -> a
+    395:395:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):667:667 -> a
+    396:396:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizedMethodAccessFlags(boolean):683:683 -> a
+    396:396:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):669 -> a
+    397:399:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):670:672 -> a
+    400:400:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> a
+    400:400:com.android.tools.r8.graph.DexEncodedMethod synthesizeUtilityMethod(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod,boolean):672 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$0(com.android.tools.r8.graph.DexMethod):187:187 -> b
+    2:7:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):455:460 -> b
     8:8:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> b
-    8:8:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):428 -> b
-    9:14:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):469:474 -> b
-    15:21:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):472:478 -> b
-    22:23:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():610:611 -> b
+    8:8:com.android.tools.r8.graph.DexEncodedField computeValuesEncodedField(com.android.tools.r8.graph.DexField):460 -> b
+    9:14:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):501:506 -> b
+    15:21:com.android.tools.r8.graph.DexMethod computeStringValueOfUtilityMethod(com.android.tools.r8.graph.DexType):504:510 -> b
+    22:23:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():642:643 -> b
     24:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):169:189 -> b
-    24:44:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():611 -> b
+    24:44:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():643 -> b
     45:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):186:196 -> b
-    45:55:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():611 -> b
+    45:55:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():643 -> b
     56:56:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> b
     56:56:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196 -> b
-    56:56:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():611 -> b
+    56:56:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():643 -> b
     57:58:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):196:197 -> b
-    57:58:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():611 -> b
+    57:58:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():643 -> b
     59:86:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_ordinal(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):177:204 -> b
-    59:86:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():611 -> b
-    87:87:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():612:612 -> b
-    1:6:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):485:490 -> c
-    7:11:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):487:491 -> c
-    12:13:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():597:598 -> c
+    59:86:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():643 -> b
+    87:87:com.android.tools.r8.graph.DexEncodedMethod synthesizeOrdinalMethod():644:644 -> b
+    1:6:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):517:522 -> c
+    7:11:com.android.tools.r8.graph.DexMethod computeValueOfUtilityMethod(com.android.tools.r8.graph.DexType):519:523 -> c
+    12:13:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():629:630 -> c
     14:34:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):268:288 -> c
-    14:34:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():598 -> c
+    14:34:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():630 -> c
     35:45:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):285:295 -> c
-    35:45:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():598 -> c
+    35:45:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():630 -> c
     46:46:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
     46:46:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295 -> c
-    46:46:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():598 -> c
+    46:46:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():630 -> c
     47:48:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):295:296 -> c
-    47:48:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():598 -> c
+    47:48:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():630 -> c
     49:73:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheck(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):276:300 -> c
-    49:73:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():598 -> c
-    74:74:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():599:599 -> c
-    75:76:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():616:617 -> c
-    75:76:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    49:73:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():630 -> c
+    74:74:com.android.tools.r8.graph.DexEncodedMethod synthesizeZeroCheckMethod():631:631 -> c
+    75:76:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():648:649 -> c
+    75:76:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     77:99:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):103:125 -> c
-    77:99:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    77:99:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    77:99:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    77:99:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     100:112:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):122:134 -> c
-    100:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    100:112:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    100:112:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    100:112:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     113:113:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
     113:113:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):134 -> c
-    113:113:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    113:113:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    113:113:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    113:113:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     114:128:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):134:148 -> c
-    114:128:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    114:128:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    114:128:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    114:128:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     129:129:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
     129:129:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):148 -> c
-    129:129:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    129:129:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    129:129:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    129:129:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     130:140:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):148:158 -> c
-    130:140:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    130:140:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    130:140:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    130:140:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     141:141:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> c
     141:141:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):158 -> c
-    141:141:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    141:141:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    141:141:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    141:141:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     142:145:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):158:161 -> c
-    142:145:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    142:145:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
+    142:145:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    142:145:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
     146:198:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_equals(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):113:165 -> c
-    146:198:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():617 -> c
-    146:198:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
-    199:199:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():618:618 -> c
-    199:199:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):178 -> c
-    1:1:java.util.List lambda$triageEncodedMembers$14(com.android.tools.r8.graph.DexType):550:550 -> d
-    2:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():622:624 -> d
-    2:4:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
+    146:198:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():649 -> c
+    146:198:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
+    199:199:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeEqualsMethod():650:650 -> c
+    199:199:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$1(com.android.tools.r8.graph.DexMethod):191 -> c
+    1:1:java.util.List lambda$triageEncodedMembers$14(com.android.tools.r8.graph.DexType):582:582 -> d
+    2:4:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():654:656 -> d
+    2:4:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
     5:25:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):51:71 -> d
-    5:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():623 -> d
-    5:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
+    5:25:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():655 -> d
+    5:25:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
     26:26:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> d
     26:26:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):71 -> d
-    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():623 -> d
-    26:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
+    26:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():655 -> d
+    26:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
     27:37:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):71:81 -> d
-    27:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():623 -> d
-    27:37:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
+    27:37:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():655 -> d
+    27:37:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
     38:50:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):78:90 -> d
-    38:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():623 -> d
-    38:50:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
+    38:50:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():655 -> d
+    38:50:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
     51:51:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> d
     51:51:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):90 -> d
-    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():623 -> d
-    51:51:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
+    51:51:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():655 -> d
+    51:51:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
     52:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):90:92 -> d
-    52:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():623 -> d
-    52:54:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
+    52:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():655 -> d
+    52:54:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
     55:95:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_compareTo(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):59:99 -> d
-    55:95:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():623 -> d
-    55:95:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
-    96:96:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():625:625 -> d
-    96:96:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):182 -> d
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$3(com.android.tools.r8.graph.DexMethod):195:195 -> e
-    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$4(com.android.tools.r8.graph.DexMethod):247:247 -> f
-    1:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():603:605 -> g
-    1:3:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):258 -> g
+    55:95:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():655 -> d
+    55:95:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
+    96:96:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeCompareToMethod():657:657 -> d
+    96:96:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$2(com.android.tools.r8.graph.DexMethod):195 -> d
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$3(com.android.tools.r8.graph.DexMethod):212:212 -> e
+    1:1:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$4(com.android.tools.r8.graph.DexMethod):268:268 -> f
+    1:3:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():635:637 -> g
+    1:3:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):279 -> g
     4:26:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):305:327 -> g
-    4:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():604 -> g
-    4:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):258 -> g
+    4:26:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():636 -> g
+    4:26:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):279 -> g
     27:40:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):323:336 -> g
-    27:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():604 -> g
-    27:40:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):258 -> g
+    27:40:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():636 -> g
+    27:40:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):279 -> g
     41:41:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> g
     41:41:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):336 -> g
-    41:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():604 -> g
-    41:41:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):258 -> g
+    41:41:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():636 -> g
+    41:41:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):279 -> g
     42:44:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):336:338 -> g
-    42:44:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():604 -> g
-    42:44:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):258 -> g
+    42:44:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():636 -> g
+    42:44:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):279 -> g
     45:74:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_zeroCheckMessage(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):313:342 -> g
-    45:74:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():604 -> g
-    45:74:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):258 -> g
-    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():606:606 -> g
-    75:75:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):258 -> g
-    1:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():629:630 -> h
-    1:2:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
+    45:74:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():636 -> g
+    45:74:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):279 -> g
+    75:75:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeZeroCheckMessageMethod():638:638 -> g
+    75:75:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$5(com.android.tools.r8.graph.DexMethod):279 -> g
+    1:2:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():661:662 -> h
+    1:2:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
     3:29:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):208:234 -> h
-    3:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():630 -> h
-    3:29:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
+    3:29:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():662 -> h
+    3:29:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
     30:30:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> h
     30:30:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):234 -> h
-    30:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():630 -> h
-    30:30:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
+    30:30:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():662 -> h
+    30:30:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
     31:54:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):234:257 -> h
-    31:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():630 -> h
-    31:54:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
+    31:54:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():662 -> h
+    31:54:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
     55:55:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.<init>(int[],java.lang.Object[]):202:202 -> h
     55:55:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):257 -> h
-    55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():630 -> h
-    55:55:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
+    55:55:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():662 -> h
+    55:55:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
     56:58:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):257:259 -> h
-    56:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():630 -> h
-    56:58:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
+    56:58:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():662 -> h
+    56:58:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
     59:104:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.optimize.enums.EnumUnboxingCfMethods.EnumUnboxingMethods_values(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):219:264 -> h
-    59:104:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():630 -> h
-    59:104:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
-    105:105:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():631:631 -> h
-    105:105:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):276 -> h
-com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.R9:
+    59:104:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():662 -> h
+    59:104:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
+    105:105:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingRewriter.synthesizeValuesUtilityMethod():663:663 -> h
+    105:105:com.android.tools.r8.graph.DexEncodedMethod lambda$rewriteCode$6(com.android.tools.r8.graph.DexMethod):297 -> h
+com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer -> com.android.tools.r8.internal.aa:
     com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator relocator -> g
     java.util.Map unboxedEnumsMethods -> b
     com.android.tools.r8.graph.DexItemFactory factory -> e
@@ -43289,82 +43671,74 @@
     125:125:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):61:61 -> a
     126:126:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
     126:126:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
-    127:127:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    127:127:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):950 -> a
+    127:127:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    127:127:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):963 -> a
     127:127:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95 -> a
     127:127:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
-    128:129:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):951:952 -> a
+    128:129:com.android.tools.r8.graph.Code com.android.tools.r8.graph.DexEncodedMethod.buildEmptyThrowingCode(com.android.tools.r8.utils.InternalOptions):964:965 -> a
     128:129:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95 -> a
     128:129:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
     130:130:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.clearEnumToUnboxMethod(com.android.tools.r8.graph.DexEncodedMethod):95:95 -> a
     130:130:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):62 -> a
-    131:133:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64:66 -> a
-    134:141:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):100:107 -> a
-    134:141:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    142:150:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):102:110 -> a
-    142:150:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    151:151:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    151:151:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):110 -> a
-    151:151:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    152:153:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):110:111 -> a
-    152:153:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    154:154:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean):99:99 -> a
-    154:154:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):111 -> a
-    154:154:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    155:157:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):112:114 -> a
-    155:157:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    158:158:void com.android.tools.r8.graph.DexEncodedMethod.clearParameterAnnotations():852:852 -> a
-    158:158:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):115 -> a
-    158:158:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    159:159:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):116:116 -> a
-    159:159:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67 -> a
-    160:161:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):67:68 -> a
-    162:162:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83:83 -> a
-    163:163:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    163:163:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83 -> a
-    164:165:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83:84 -> a
-    166:168:void lambda$fixupEncodedMethod$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):138:140 -> a
-    169:169:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1533:1533 -> a
-    169:169:void lambda$fixupEncodedMethod$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):139 -> a
-    170:170:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147:147 -> a
-    171:171:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    171:171:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):147 -> a
-    172:173:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):148:149 -> a
-    174:174:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
-    174:174:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):149 -> a
-    175:178:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):150:153 -> a
-    179:190:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):151:162 -> a
-    191:191:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):159:159 -> a
-    192:192:boolean lambda$ensureUniqueMethod$4(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):154:154 -> a
-    193:199:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):172:178 -> a
+    131:135:void lambda$fixupTypeReferences$1(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):64:68 -> a
+    136:136:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83:83 -> a
+    137:137:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    137:137:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83 -> a
+    138:139:void lambda$fixupTypeReferences$2(com.android.tools.r8.graph.DexType,java.util.List):83:84 -> a
+    140:147:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):100:107 -> a
+    148:156:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):102:110 -> a
+    157:157:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    157:157:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):110 -> a
+    158:159:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):110:111 -> a
+    160:160:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,boolean,boolean):99:99 -> a
+    160:160:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):111 -> a
+    161:163:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):112:114 -> a
+    164:164:void com.android.tools.r8.graph.DexEncodedMethod.clearParameterAnnotations():865:865 -> a
+    164:164:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):115 -> a
+    165:165:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethodToUtility(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):116:116 -> a
+    166:168:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):139:141 -> a
+    169:169:com.android.tools.r8.graph.DexEncodedMethod$Builder com.android.tools.r8.graph.DexEncodedMethod$Builder.setIsLibraryMethodOverrideIf(boolean,com.android.tools.r8.utils.OptionalBool):1546:1546 -> a
+    169:169:void lambda$fixupEncodedMethod$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):140 -> a
+    170:170:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):148:148 -> a
+    171:171:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    171:171:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):148 -> a
+    172:173:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):149:150 -> a
+    174:174:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
+    174:174:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):150 -> a
+    175:178:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):151:154 -> a
+    179:190:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):152:163 -> a
+    191:191:com.android.tools.r8.graph.DexMethod ensureUniqueMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):160:160 -> a
+    192:192:boolean lambda$ensureUniqueMethod$5(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):155:155 -> a
+    193:199:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):173:179 -> a
     200:295:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.move(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):0:95 -> a
-    200:295:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):178 -> a
-    296:297:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):179:180 -> a
-    298:298:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    298:298:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):181 -> a
-    299:301:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):181:183 -> a
-    302:303:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):191:192 -> a
-    304:306:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):214:216 -> a
-    304:306:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):192 -> a
-    307:307:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):193:193 -> a
-    308:318:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):197:207 -> a
+    200:295:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):179 -> a
+    296:297:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):180:181 -> a
+    298:298:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
+    298:298:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):182 -> a
+    299:301:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):182:184 -> a
+    302:303:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):192:193 -> a
+    304:306:com.android.tools.r8.graph.DexType[] com.android.tools.r8.ir.optimize.enums.EnumUnboxingTreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):215:217 -> a
+    304:306:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):193 -> a
+    307:307:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):194:194 -> a
+    308:318:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):198:208 -> a
     319:407:void com.android.tools.r8.ir.optimize.enums.EnumUnboxingLens$Builder.map(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):0:88 -> a
-    319:407:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):207 -> a
-    408:408:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
-    408:408:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):120 -> a
-    409:409:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):120:120 -> a
-    410:410:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():389:389 -> a
-    410:410:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):121 -> a
-    411:428:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):124:141 -> a
+    319:407:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):208 -> a
+    408:408:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():393:393 -> a
+    408:408:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):121 -> a
+    409:409:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):121:121 -> a
+    410:410:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexEncodedMethod.proto():393:393 -> a
+    410:410:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):122 -> a
+    411:428:com.android.tools.r8.graph.DexEncodedMethod fixupEncodedMethod(com.android.tools.r8.graph.DexEncodedMethod):125:142 -> a
     1:1:java.util.List lambda$fixupTypeReferences$0(com.android.tools.r8.graph.DexType):66:66 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueInfoMapCollector -> com.android.tools.r8.internal.T9:
+    2:2:void lambda$fixupEncodedMethodToUtility$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod$Builder):117:117 -> b
+com.android.tools.r8.ir.optimize.enums.EnumValueInfoMapCollector -> com.android.tools.r8.internal.ca:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.EnumValueInfoMapCollection$Builder valueInfoMapsBuilder -> b
     1:1:void <init>(com.android.tools.r8.graph.AppView):37:37 -> <init>
     2:5:void <init>(com.android.tools.r8.graph.AppView):35:38 -> <init>
     1:8:com.android.tools.r8.shaking.AppInfoWithLiveness run():42:49 -> a
     9:47:void processClasses(com.android.tools.r8.graph.DexProgramClass):54:92 -> a
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.W9:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer -> com.android.tools.r8.internal.fa:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -43373,7 +43747,7 @@
     1:4:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):228:231 -> a
     5:16:com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.IntSwitch):378:389 -> a
     5:16:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):237 -> a
-    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    17:17:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     17:17:com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.IntSwitch):389 -> a
     17:17:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):237 -> a
     18:27:com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.analyzeSwitchOverEnum(com.android.tools.r8.ir.code.IntSwitch):390:399 -> a
@@ -43400,7 +43774,7 @@
     91:98:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):302:309 -> a
     99:99:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
     99:99:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):312 -> a
-    100:100:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    100:100:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     100:100:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
     100:100:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):312 -> a
     101:117:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):316:332 -> a
@@ -43415,45 +43789,39 @@
     9:33:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):74:98 -> b
     34:123:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> b
     34:123:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):98 -> b
-    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     124:124:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> b
     124:124:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):98 -> b
     125:143:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):98:116 -> b
     144:233:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> b
     144:233:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):117 -> b
-    234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     234:234:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> b
     234:234:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):117 -> b
     235:241:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):117:123 -> b
-    242:242:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
+    242:242:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> b
     242:242:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):122 -> b
     243:244:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):129:130 -> b
     245:334:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> b
     245:334:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):131 -> b
-    335:335:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    335:335:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     335:335:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> b
     335:335:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):131 -> b
-    336:349:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):131:144 -> b
-    350:350:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> b
-    350:350:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):144 -> b
-    351:355:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):145:149 -> b
-    356:356:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
-    356:356:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):145 -> b
-    357:383:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):150:176 -> b
-    384:384:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> b
-    384:384:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):176 -> b
-    385:389:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):177:181 -> b
-    390:390:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
-    390:390:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):177 -> b
-    391:391:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):182:182 -> b
-    392:392:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> b
-    392:392:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):183 -> b
-    393:410:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):185:202 -> b
-    411:411:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
-    411:411:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):202 -> b
-    412:414:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):202:204 -> b
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.U9:
-com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.V9:
+    336:354:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):131:149 -> b
+    355:355:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> b
+    355:355:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):145 -> b
+    356:387:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):150:181 -> b
+    388:388:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> b
+    388:388:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):177 -> b
+    389:389:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):182:182 -> b
+    390:390:boolean com.android.tools.r8.ir.code.Instruction.isArrayLength():0:0 -> b
+    390:390:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):183 -> b
+    391:408:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):185:202 -> b
+    409:409:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
+    409:409:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):202 -> b
+    410:412:void rewriteConstantEnumMethodCalls(com.android.tools.r8.ir.code.IRCode):202:204 -> b
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1 -> com.android.tools.r8.internal.da:
+com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo -> com.android.tools.r8.internal.ea:
     com.android.tools.r8.ir.code.Instruction arrayGet -> b
     com.android.tools.r8.ir.code.Instruction staticGet -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap indexMap -> d
@@ -43461,7 +43829,7 @@
     com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap valueInfoMap -> e
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$1):336:336 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap):351:357 -> <init>
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.SB:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator -> com.android.tools.r8.internal.mC:
     com.android.tools.r8.com.google.common.collect.ImmutableMap relocationMap -> b
     com.android.tools.r8.graph.DexType defaultEnumUnboxingUtility -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1):27:27 -> <init>
@@ -43471,8 +43839,8 @@
     3:3:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):666:666 -> a
     3:3:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):45 -> a
     4:4:com.android.tools.r8.graph.DexType getNewMemberLocationFor(com.android.tools.r8.graph.DexType):45:45 -> a
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1 -> com.android.tools.r8.internal.QB:
-com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.RB:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$1 -> com.android.tools.r8.internal.kC:
+com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder -> com.android.tools.r8.internal.lC:
     java.util.Map relocationMap -> c
     com.android.tools.r8.graph.AppView appView -> d
     com.android.tools.r8.graph.DexType defaultEnumUnboxingUtility -> b
@@ -43486,7 +43854,7 @@
     9:10:com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator build():79:80 -> a
     11:14:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder.findDeterministicContextType(java.util.Set):143:146 -> a
     11:14:com.android.tools.r8.graph.DexType synthesizeUtilityClass(java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):98 -> a
-    15:15:int com.android.tools.r8.graph.DexType.slowCompareTo(com.android.tools.r8.graph.DexType):209:209 -> a
+    15:15:int com.android.tools.r8.graph.DexType.slowCompareTo(com.android.tools.r8.graph.DexType):214:214 -> a
     15:15:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder.findDeterministicContextType(java.util.Set):146 -> a
     15:15:com.android.tools.r8.graph.DexType synthesizeUtilityClass(java.util.Set,com.android.tools.r8.graph.DirectMappedDexApplication$Builder):98 -> a
     16:16:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.enums.UnboxedEnumMemberRelocator$Builder.findDeterministicContextType(java.util.Set):147:147 -> a
@@ -43531,7 +43899,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.BottomCallSiteOptimizationInfo bottom():23:23 -> c
     boolean isTop() -> d
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo top():27:27 -> e
-com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.U6:
+com.android.tools.r8.ir.optimize.info.ConcreteCallSiteOptimizationInfo -> com.android.tools.r8.internal.Z6:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap constants -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap dynamicUpperBoundTypes -> d
     boolean $assertionsDisabled -> b
@@ -43555,7 +43923,7 @@
     1:6:boolean equals(java.lang.Object):208:213 -> equals
     1:2:int hashCode():218:219 -> hashCode
     1:2:java.lang.String toString():224:225 -> toString
-com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.L7:
+com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo -> com.android.tools.r8.internal.Q7:
     com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo INSTANCE -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:void <init>():16:16 -> <init>
@@ -43568,7 +43936,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy():24:24 -> h
     boolean valueHasBeenPropagated() -> i
     1:1:com.android.tools.r8.ir.optimize.info.DefaultFieldOptimizationInfo getInstance():19:19 -> j
-com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.R7:
+com.android.tools.r8.ir.optimize.info.DefaultMethodOptimizationInfo -> com.android.tools.r8.internal.W7:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo DEFAULT_INSTANCE -> a
     boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS -> e
     boolean $assertionsDisabled -> f
@@ -43606,7 +43974,7 @@
     boolean neverReturnsNormally() -> x
     boolean returnValueHasBeenPropagated() -> y
     boolean returnValueOnlyDependsOnArguments() -> z
-com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Ba:
+com.android.tools.r8.ir.optimize.info.FieldOptimizationInfo -> com.android.tools.r8.internal.Ka:
     1:1:void <init>():11:11 -> <init>
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo asMutableFieldOptimizationInfo() -> a
     boolean cannotBeKept() -> b
@@ -43617,13 +43985,13 @@
     boolean isDead() -> g
     com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo mutableCopy() -> h
     boolean valueHasBeenPropagated() -> i
-com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.nm:
+com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback -> com.android.tools.r8.internal.Am:
     com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback INSTANCE -> b
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():15:15 -> <init>
     1:1:void recordLibraryFieldHasAbstractValue(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.ir.analysis.value.AbstractValue):23:23 -> a
     1:1:com.android.tools.r8.ir.optimize.info.LibraryOptimizationInfoInitializerFeedback getInstance():18:18 -> b
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.Fo:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo -> com.android.tools.r8.internal.Ro:
     1:1:void <init>():18:18 -> <init>
     boolean returnsArgument() -> A
     boolean triggersClassInitBeforeAnySideEffect() -> B
@@ -43654,335 +44022,342 @@
     boolean neverReturnsNormally() -> x
     boolean returnValueHasBeenPropagated() -> y
     boolean returnValueOnlyDependsOnArguments() -> z
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.internal.Fo$a:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference -> com.android.tools.r8.internal.Ro$a:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference NeverInline -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference ForceInline -> b
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfo$InlinePreference Default -> c
     1:3:void <clinit>():21:23 -> <clinit>
     1:1:void <init>(java.lang.String,int):20:20 -> <init>
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.Ho:
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector -> com.android.tools.r8.internal.To:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization checkCastAndInstanceOfMethodSpecialization -> c
     com.android.tools.r8.utils.InternalOptions options -> e
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():117:117 -> <clinit>
-    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):126:133 -> <init>
-    1:1:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143:143 -> a
-    2:4:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):163:165 -> a
-    2:4:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
-    5:7:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):170:172 -> a
-    5:7:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
-    8:8:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):316:316 -> a
-    8:8:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
-    9:12:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):323:326 -> a
-    9:12:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):317 -> a
-    9:12:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
-    13:22:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):340:349 -> a
-    13:22:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):327 -> a
-    13:22:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):317 -> a
-    13:22:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
+    1:1:void <clinit>():115:115 -> <clinit>
+    1:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.conversion.IRConverter):124:131 -> <init>
+    1:1:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):141:141 -> a
+    2:4:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyBridgeInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):161:163 -> a
+    2:4:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):142 -> a
+    5:7:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):168:170 -> a
+    5:7:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):143 -> a
+    8:8:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):314:314 -> a
+    8:8:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    9:12:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):321:324 -> a
+    9:12:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):315 -> a
+    9:12:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    13:22:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):338:347 -> a
+    13:22:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):325 -> a
+    13:22:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):315 -> a
+    13:22:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
     23:23:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
-    23:23:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):352 -> a
-    23:23:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):327 -> a
-    23:23:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):317 -> a
-    23:23:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
-    24:28:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):353:357 -> a
-    24:28:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):327 -> a
-    24:28:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):317 -> a
-    24:28:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
-    29:36:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):329:336 -> a
-    29:36:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):317 -> a
-    29:36:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
-    37:37:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):332:332 -> a
-    37:37:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):317 -> a
-    37:37:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
-    38:38:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):318:318 -> a
-    38:38:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146 -> a
-    39:39:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):361:361 -> a
-    39:39:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
-    40:70:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):367:397 -> a
-    40:70:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):362 -> a
-    40:70:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
-    71:71:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):363:363 -> a
-    71:71:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
-    72:72:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):148:148 -> a
-    73:73:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):705:705 -> a
-    73:73:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
-    74:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):712:715 -> a
-    74:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):706 -> a
-    74:77:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
-    78:84:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):714:720 -> a
-    78:84:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):706 -> a
-    78:84:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
-    85:85:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):719:719 -> a
-    85:85:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):706 -> a
-    85:85:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
-    86:86:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):707:707 -> a
-    86:86:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
+    23:23:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):350 -> a
+    23:23:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):325 -> a
+    23:23:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):315 -> a
+    23:23:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    24:28:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.collectParameterUsages(int,com.android.tools.r8.ir.code.Value):351:355 -> a
+    24:28:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):325 -> a
+    24:28:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):315 -> a
+    24:28:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    29:36:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):327:334 -> a
+    29:36:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):315 -> a
+    29:36:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    37:37:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):330:330 -> a
+    37:37:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):315 -> a
+    37:37:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    38:38:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyParameterUsages(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):316:316 -> a
+    38:38:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):144 -> a
+    39:39:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):359:359 -> a
+    39:39:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    40:70:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):365:395 -> a
+    40:70:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):360 -> a
+    40:70:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    71:71:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeReturns(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):361:361 -> a
+    71:71:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):145 -> a
+    72:72:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):146:146 -> a
+    73:73:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):703:703 -> a
+    73:73:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
+    74:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):710:713 -> a
+    74:77:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):704 -> a
+    74:77:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
+    78:84:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):712:718 -> a
+    78:84:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):704 -> a
+    78:84:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
+    85:85:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):717:717 -> a
+    85:85:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):704 -> a
+    85:85:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
+    86:86:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.identifyInvokeSemanticsForInlining(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):705:705 -> a
+    86:86:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):147 -> a
     87:87:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):974:974 -> a
-    87:87:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    87:87:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
     88:98:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):985:995 -> a
     88:98:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):975 -> a
-    88:98:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    88:98:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
     99:124:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):994:1019 -> a
     99:124:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):975 -> a
-    99:124:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    99:124:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
     125:129:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1016:1020 -> a
     125:129:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):975 -> a
-    125:129:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    125:129:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
     130:130:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeDynamicReturnType(com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):976:976 -> a
-    130:130:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    130:130:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):149 -> a
     131:131:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1027:1027 -> a
-    131:131:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):152 -> a
+    131:131:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):150 -> a
     132:138:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1034:1040 -> a
     132:138:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1028 -> a
-    132:138:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):152 -> a
+    132:138:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):150 -> a
     139:139:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInitializedClassesOnNormalExit(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1029:1029 -> a
-    139:139:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):152 -> a
-    140:140:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):411:411 -> a
-    140:140:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    141:153:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):421:433 -> a
-    141:153:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    141:153:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    139:139:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):150 -> a
+    140:140:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):409:409 -> a
+    140:140:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    141:153:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):419:431 -> a
+    141:153:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    141:153:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     154:206:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo.builder(com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):0:52 -> a
-    154:206:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):438 -> a
-    154:206:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    154:206:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    207:410:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):464:667 -> a
-    207:410:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    207:410:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    207:410:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    411:412:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):652:653 -> a
-    411:412:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    411:412:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    411:412:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    154:206:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):436 -> a
+    154:206:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    154:206:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    207:410:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):462:665 -> a
+    207:410:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    207:410:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    207:410:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    411:412:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):650:651 -> a
+    411:412:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    411:412:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    411:412:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     413:413:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):582:582 -> a
-    413:413:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):653 -> a
-    413:413:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    413:413:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    413:413:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    414:415:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):656:657 -> a
-    414:415:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    414:415:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    414:415:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    416:417:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):620:621 -> a
-    416:417:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    416:417:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    416:417:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    413:413:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):651 -> a
+    413:413:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    413:413:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    413:413:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    414:415:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):654:655 -> a
+    414:415:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    414:415:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    414:415:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    416:417:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):618:619 -> a
+    416:417:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    416:417:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    416:417:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     418:418:boolean com.android.tools.r8.ir.code.Instruction.instructionMayHaveSideEffects(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):582:582 -> a
-    418:418:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):621 -> a
-    418:418:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    418:418:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    418:418:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    419:440:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):622:643 -> a
-    419:440:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    419:440:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    419:440:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    441:443:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):570:572 -> a
-    441:443:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    441:443:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    441:443:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    418:418:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):619 -> a
+    418:418:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    418:418:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    418:418:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    419:440:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):620:641 -> a
+    419:440:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    419:440:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    419:440:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    441:443:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):568:570 -> a
+    441:443:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    441:443:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    441:443:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     444:533:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    444:533:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):572 -> a
-    444:533:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    444:533:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    444:533:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    534:534:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    444:533:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):570 -> a
+    444:533:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    444:533:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    444:533:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    534:534:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     534:534:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
-    534:534:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):572 -> a
-    534:534:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    534:534:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    534:534:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    535:552:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):573:590 -> a
-    535:552:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    535:552:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    535:552:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    534:534:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):570 -> a
+    534:534:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    534:534:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    534:534:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    535:552:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):571:588 -> a
+    535:552:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    535:552:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    535:552:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     553:553:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):219:219 -> a
-    553:553:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):590 -> a
-    553:553:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    553:553:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    553:553:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    554:566:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):591:603 -> a
-    554:566:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    554:566:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    554:566:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    567:593:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):584:610 -> a
-    567:593:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    567:593:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    567:593:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    594:601:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):544:551 -> a
-    594:601:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    594:601:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    594:601:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    553:553:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):588 -> a
+    553:553:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    553:553:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    553:553:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    554:566:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):589:601 -> a
+    554:566:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    554:566:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    554:566:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    567:593:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):582:608 -> a
+    567:593:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    567:593:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    567:593:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    594:601:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):542:549 -> a
+    594:601:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    594:601:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    594:601:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     602:602:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):219:219 -> a
-    602:602:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):551 -> a
-    602:602:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    602:602:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    602:602:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    603:603:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):552:552 -> a
-    603:603:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    603:603:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    603:603:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    602:602:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):549 -> a
+    602:602:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    602:602:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    602:602:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    603:603:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):550:550 -> a
+    603:603:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    603:603:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    603:603:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     604:604:boolean com.android.tools.r8.ir.code.FieldInstruction.instructionInstanceCanThrow(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod):63:63 -> a
-    604:604:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):552 -> a
-    604:604:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    604:604:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    604:604:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    605:608:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):553:556 -> a
-    605:608:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    605:608:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    605:608:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    604:604:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):550 -> a
+    604:604:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    604:604:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    604:604:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    605:608:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):551:554 -> a
+    605:608:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    605:608:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    605:608:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     609:609:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):219:219 -> a
-    609:609:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):556 -> a
-    609:609:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    609:609:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    609:609:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    610:614:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):559:563 -> a
-    610:614:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    610:614:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    610:614:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    615:623:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):525:533 -> a
-    615:623:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    615:623:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    615:623:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    609:609:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):554 -> a
+    609:609:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    609:609:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    609:609:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    610:614:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):557:561 -> a
+    610:614:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    610:614:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    610:614:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    615:623:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):523:531 -> a
+    615:623:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    615:623:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    615:623:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     624:624:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    624:624:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):534 -> a
-    624:624:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    624:624:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    624:624:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    625:625:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):536:536 -> a
-    625:625:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    625:625:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    625:625:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    626:825:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):489:688 -> a
-    626:825:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):439 -> a
-    626:825:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    626:825:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    826:826:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):444:444 -> a
-    826:826:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    826:826:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    827:827:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):440:440 -> a
-    827:827:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):412 -> a
-    827:827:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
-    828:828:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):413:413 -> a
-    828:828:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    624:624:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):532 -> a
+    624:624:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    624:624:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    624:624:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    625:625:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):534:534 -> a
+    625:625:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    625:625:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    625:625:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    626:825:com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.analyzeInstanceInitializer(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder):487:686 -> a
+    626:825:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):437 -> a
+    626:825:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    626:825:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    826:826:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):442:442 -> a
+    826:826:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    826:826:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    827:827:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection):438:438 -> a
+    827:827:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):410 -> a
+    827:827:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
+    828:828:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeInstanceInitializerInfo(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):411:411 -> a
+    828:828:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):151 -> a
     829:829:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1047:1047 -> a
-    829:829:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    829:829:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     830:842:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1055:1067 -> a
     830:842:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    830:842:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    830:842:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     843:843:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.isNone():32:32 -> a
     843:843:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1068 -> a
     843:843:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    843:843:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    843:843:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     844:845:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1069:1070 -> a
     844:845:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    844:845:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    844:845:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     846:846:boolean com.android.tools.r8.ir.analysis.sideeffect.ClassInitializerSideEffectAnalysis$ClassInitializerSideEffect.canBePostponed():28:28 -> a
     846:846:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1071 -> a
     846:846:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    846:846:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    846:846:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     847:849:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1072:1074 -> a
     847:849:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    847:849:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
-    850:851:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():294:295 -> a
+    847:849:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    850:851:boolean com.android.tools.r8.graph.DexType.isD8R8SynthesizedLambdaClassType():299:300 -> a
     850:851:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1074 -> a
     850:851:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    850:851:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    850:851:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     852:855:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1074:1074 -> a
     852:855:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    852:855:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    852:855:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     858:858:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1077:1077 -> a
     858:858:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    858:858:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
-    859:859:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    858:858:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
+    859:859:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
     859:859:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1082 -> a
     859:859:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    859:859:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    859:859:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     860:860:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1085:1085 -> a
     860:860:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    860:860:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    860:860:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     861:870:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.hasNonTrivialFinalizeMethod(com.android.tools.r8.graph.DexProgramClass):1107:1116 -> a
     861:870:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1085 -> a
     861:870:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    861:870:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    861:870:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     871:879:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1093:1101 -> a
     871:879:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1048 -> a
-    871:879:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    871:879:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     880:880:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeMayHaveSideEffects(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1049:1049 -> a
-    880:880:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
+    880:880:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):153 -> a
     881:881:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1123:1123 -> a
-    881:881:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
+    881:881:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):154 -> a
     882:888:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1130:1136 -> a
     882:888:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1124 -> a
-    882:888:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
+    882:888:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):154 -> a
     889:889:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeReturnValueOnlyDependsOnArguments(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1125:1125 -> a
-    889:889:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
+    889:889:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):154 -> a
     890:890:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1142:1142 -> a
-    890:890:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):157 -> a
+    890:890:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
     891:913:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):1150:1172 -> a
     891:913:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1143 -> a
-    891:913:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):157 -> a
+    891:913:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
     914:914:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOrThrow(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1144:1144 -> a
-    914:914:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):157 -> a
+    914:914:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):155 -> a
     915:915:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1178:1178 -> a
-    915:915:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):158 -> a
+    915:915:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
     916:947:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1184:1215 -> a
     916:947:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1179 -> a
-    916:947:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):158 -> a
+    916:947:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
     948:993:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isNormalExitDominated(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.DominatorTree,java.util.Set):1237:1282 -> a
     948:993:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1216 -> a
     948:993:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1179 -> a
-    948:993:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):158 -> a
+    948:993:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
     994:999:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode):1222:1227 -> a
     994:999:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1179 -> a
-    994:999:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):158 -> a
+    994:999:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
     1000:1000:void com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.computeNonNullParamOnNormalExits(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.utils.Timing):1180:1180 -> a
-    1000:1000:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):158 -> a
-    1001:1003:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):189:191 -> a
-    1004:1004:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():480:480 -> a
-    1004:1004:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):192 -> a
-    1005:1100:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):193:288 -> a
-    1101:1107:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):263:269 -> a
-    1108:1112:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):247:251 -> a
-    1113:1126:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):226:239 -> a
-    1127:1127:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
-    1127:1127:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):303 -> a
-    1128:1134:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):303:309 -> a
-    1135:1135:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):305:305 -> a
+    1000:1000:void collectMethodOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.optimize.DynamicTypeOptimization,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection,com.android.tools.r8.utils.Timing):156 -> a
+    1001:1003:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):187:189 -> a
+    1004:1004:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():484:484 -> a
+    1004:1004:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):190 -> a
+    1005:1100:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):191:286 -> a
+    1101:1107:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):261:267 -> a
+    1108:1112:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):245:249 -> a
+    1113:1126:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):224:237 -> a
+    1127:1127:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
+    1127:1127:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):301 -> a
+    1128:1134:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):301:307 -> a
+    1135:1135:void identifyClassInlinerEligibility(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback):303:303 -> a
     1136:1136:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):219:219 -> a
-    1136:1136:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.AliasedValueConfiguration,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):211 -> a
-    1137:1137:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):693:693 -> a
+    1136:1136:boolean lambda$identifyClassInlinerEligibility$0(com.android.tools.r8.ir.code.AliasedValueConfiguration,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):209 -> a
+    1137:1137:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):691:691 -> a
     1138:1138:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Value.getAliasedValue(com.android.tools.r8.ir.code.AliasedValueConfiguration):219:219 -> a
-    1138:1138:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):697 -> a
-    1139:1139:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.ir.code.IRCode):731:731 -> a
-    1140:1142:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):734:736 -> a
-    1143:1162:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):735:754 -> a
-    1163:1221:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):766:824 -> a
-    1222:1261:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):785:824 -> a
-    1262:1274:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):812:824 -> a
-    1275:1275:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):835:835 -> a
-    1276:1282:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):838:844 -> a
-    1283:1301:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.AppView):918:936 -> a
-    1283:1301:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):844 -> a
-    1302:1321:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):845:864 -> a
-    1322:1327:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):863:868 -> a
-    1328:1335:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):955:962 -> a
-    1328:1335:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):868 -> a
-    1336:1347:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):869:880 -> a
-    1348:1348:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
-    1348:1348:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):883 -> a
-    1349:1355:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):883:889 -> a
-    1356:1358:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):944:946 -> a
-com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.Go:
+    1138:1138:boolean couldBeReceiverValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.AliasedValueConfiguration):695 -> a
+    1139:1139:boolean triggersClassInitializationBeforeSideEffect(com.android.tools.r8.ir.code.IRCode):729:729 -> a
+    1140:1142:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):732:734 -> a
+    1143:1162:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$triggersClassInitializationBeforeSideEffect$1(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):733:752 -> a
+    1163:1221:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):764:822 -> a
+    1222:1261:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):783:822 -> a
+    1262:1274:boolean alwaysTriggerExpectedEffectBeforeAnythingElse(com.android.tools.r8.ir.code.IRCode,java.util.function.BiFunction):810:822 -> a
+    1275:1275:boolean checksNullBeforeSideEffect(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Value):833:833 -> a
+    1276:1284:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):836:844 -> a
+    1285:1294:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):911:920 -> a
+    1285:1294:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):844 -> a
+    1295:1295:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.Invoke.getFirstArgument():160:160 -> a
+    1295:1295:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):921 -> a
+    1295:1295:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):844 -> a
+    1296:1296:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinCheckParameterIsNotNull(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.Value):922:922 -> a
+    1296:1296:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):844 -> a
+    1297:1299:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):845:847 -> a
+    1300:1310:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isKotlinThrowParameterIsNullException(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeStatic):930:940 -> a
+    1300:1310:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):847 -> a
+    1311:1321:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):850:860 -> a
+    1322:1329:boolean com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector.isInstantiationOfNullPointerException(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator,com.android.tools.r8.graph.DexItemFactory):955:962 -> a
+    1322:1329:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):860 -> a
+    1330:1341:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):861:872 -> a
+    1342:1342:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
+    1342:1342:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):875 -> a
+    1343:1349:com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect lambda$checksNullBeforeSideEffect$2(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionIterator):875:881 -> a
+    1350:1352:boolean isNullCheck(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.Value):944:946 -> a
+com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect -> com.android.tools.r8.internal.So:
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect DESIRED_EFFECT -> a
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect NO_EFFECT -> d
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect OTHER_EFFECT -> c
     com.android.tools.r8.ir.optimize.info.MethodOptimizationInfoCollector$InstructionEffect CONDITIONAL_EFFECT -> b
-    1:4:void <clinit>():908:911 -> <clinit>
-    1:1:void <init>(java.lang.String,int):907:907 -> <init>
-com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.tp:
+    1:4:void <clinit>():900:903 -> <clinit>
+    1:1:void <init>(java.lang.String,int):899:899 -> <init>
+com.android.tools.r8.ir.optimize.info.MutableFieldOptimizationInfo -> com.android.tools.r8.internal.Fp:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> e
     int readBits -> d
     boolean $assertionsDisabled -> a
@@ -44009,16 +44384,16 @@
     1:1:void markAsDead():118:118 -> j
     1:1:void markAsPropagated():127:127 -> k
     1:1:void markCannotBeKept():91:91 -> l
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback -> com.android.tools.r8.internal.Wr:
     1:1:void <init>():18:18 -> <init>
     void modifyAppInfoWithLiveness(java.util.function.Consumer) -> a
     1:1:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):32:32 -> a
     2:2:void fixupOptimizationInfos(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer):31:31 -> a
     3:4:void lambda$fixupOptimizationInfos$0(com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer,com.android.tools.r8.graph.DexProgramClass):34:35 -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.Kr$a:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedback$OptimizationInfoFixer -> com.android.tools.r8.internal.Wr$a:
     void fixup(com.android.tools.r8.graph.DexEncodedField) -> a
     void fixup(com.android.tools.r8.graph.DexEncodedMethod) -> a
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.Lr:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackDelayed -> com.android.tools.r8.internal.Xr:
     java.util.Map fieldOptimizationInfos -> c
     java.util.Map methodOptimizationInfos -> d
     boolean $assertionsDisabled -> a
@@ -44097,7 +44472,7 @@
     void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod) -> g
 com.android.tools.r8.ir.optimize.info.OptimizationFeedbackIgnore$1 -> com.android.tools.r8.ir.optimize.info.a$a:
     1:1:void <init>():24:24 -> <init>
-com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.Mr:
+com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple -> com.android.tools.r8.internal.Yr:
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple INSTANCE -> a
     1:1:void <clinit>():24:24 -> <clinit>
     1:1:void <init>():26:26 -> <init>
@@ -44131,7 +44506,7 @@
     1:1:void markMethodCannotBeKept(com.android.tools.r8.graph.DexEncodedMethod):84:84 -> f
     1:1:void setInitializerEnablingJavaVmAssertions(com.android.tools.r8.graph.DexEncodedMethod):175:175 -> g
     1:1:void unsetAbstractReturnValue(com.android.tools.r8.graph.DexEncodedMethod):106:106 -> h
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.internal.os:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo -> com.android.tools.r8.internal.As:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList parametersUsages -> b
     1:1:void <clinit>():31:31 -> <clinit>
@@ -44143,7 +44518,7 @@
     7:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage.copyAndShift(com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage,int):117:118 -> b
     7:8:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58 -> b
     9:22:com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo remove(int):58:71 -> b
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.internal.os$a:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsage -> com.android.tools.r8.internal.As$a:
     java.util.Set ifZeroTest -> c
     boolean isUsedInMonitor -> i
     java.util.List callsReceiver -> d
@@ -44156,7 +44531,7 @@
     1:1:void <clinit>():74:74 -> <clinit>
     1:11:void <init>(int,java.util.Set,java.util.List,boolean,boolean,boolean,boolean,boolean):103:113 -> <init>
     1:2:boolean notUsed():130:131 -> a
-com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.internal.ps:
+com.android.tools.r8.ir.optimize.info.ParameterUsagesInfo$ParameterUsageBuilder -> com.android.tools.r8.internal.Bs:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     java.util.List callsOnReceiver -> f
     boolean isAssignedToField -> i
@@ -44204,12 +44579,12 @@
     49:49:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):239:239 -> a
     50:55:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):238:243 -> a
     56:56:boolean note(com.android.tools.r8.ir.code.InvokeMethodWithReceiver):240:240 -> a
-com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.EA:
+com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo -> com.android.tools.r8.internal.XA:
     com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo INSTANCE -> b
     1:1:void <clinit>():9:9 -> <clinit>
     1:1:void <init>():11:11 -> <init>
     1:1:com.android.tools.r8.ir.optimize.info.TopCallSiteOptimizationInfo getInstance():14:14 -> f
-com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.internal.mC:
+com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo -> com.android.tools.r8.internal.LC:
     com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo bridgeInfo -> i
     int flags -> o
     java.util.BitSet nonNullParamOrThrow -> m
@@ -44244,12 +44619,11 @@
     1:2:void markForceInline():445:446 -> G
     1:1:void markInlinedIntoSingleCallSite():276:276 -> H
     1:1:void markMayNotHaveSideEffects():393:393 -> I
-    1:2:void markNeverInline():459:460 -> J
-    1:1:void markNeverReturnsNormally():401:401 -> K
-    1:1:void markReturnValueOnlyDependsOnArguments():397:397 -> L
-    1:1:void setInitializerEnablingJavaAssertions():379:379 -> M
-    1:1:void unsetAbstractReturnValue():411:411 -> N
-    1:2:void unsetForceInline():452:453 -> O
+    1:1:void markNeverReturnsNormally():401:401 -> J
+    1:1:void markReturnValueOnlyDependsOnArguments():397:397 -> K
+    1:1:void setInitializerEnablingJavaAssertions():379:379 -> L
+    1:1:void unsetAbstractReturnValue():411:411 -> M
+    1:2:void unsetForceInline():452:453 -> N
     com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo asUpdatableMethodOptimizationInfo() -> a
     1:13:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupClassTypeReferences(java.util.function.Function,com.android.tools.r8.graph.AppView):149:161 -> a
     14:14:com.android.tools.r8.ir.optimize.info.UpdatableMethodOptimizationInfo fixupAbstractReturnValue(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):169:169 -> a
@@ -44323,7 +44697,7 @@
     40:40:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
     41:41:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeCheckCastAfterInvoke(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):148:148 -> a
     41:41:boolean analyzeCheckCast(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.CheckCast,com.android.tools.r8.ir.code.InvokeMethod):95 -> a
-    42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
+    42:42:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():476:476 -> a
     42:42:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):27 -> a
     43:93:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):27:77 -> a
     94:96:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeReturn(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.CheckCast):168:170 -> a
@@ -44332,13 +44706,13 @@
     98:100:boolean com.android.tools.r8.ir.optimize.info.bridge.BridgeAnalyzer.analyzeInvokeVirtual(com.android.tools.r8.ir.code.InvokeVirtual):153:155 -> a
     98:100:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):68 -> a
     101:102:com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo analyzeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.ir.code.IRCode):87:88 -> a
-com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.JC:
+com.android.tools.r8.ir.optimize.info.bridge.VirtualBridgeInfo -> com.android.tools.r8.internal.zD:
     com.android.tools.r8.graph.DexMethod invokedMethod -> a
     1:1:void com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo.<init>():10:10 -> <init>
     1:1:void <init>(com.android.tools.r8.graph.DexMethod):32 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexMethod):33:33 -> <init>
     1:1:com.android.tools.r8.graph.DexMethod getInvokedMethod():37:37 -> a
-com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.g9:
+com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.p9:
     com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection INSTANCE -> a
     1:1:void <clinit>():21:21 -> <clinit>
     1:1:void <init>():24:24 -> <init>
@@ -44348,7 +44722,7 @@
     void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
     1:1:com.android.tools.r8.ir.optimize.info.field.EmptyInstanceFieldInitializationInfoCollection getInstance():27:27 -> c
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.Pd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo -> com.android.tools.r8.internal.de:
     int argumentIndex -> a
     1:2:void <init>(int):20:21 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
@@ -44356,14 +44730,14 @@
     boolean isArgumentInitializationInfo() -> d
     1:1:int getArgumentIndex():25:25 -> f
     1:1:java.lang.String toString():49:49 -> toString
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.Qd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo -> com.android.tools.r8.internal.ee:
     boolean isTypeInitializationInfo() -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo asArgumentInitializationInfo() -> b
     boolean isSingleValue() -> c
     boolean isArgumentInitializationInfo() -> d
     com.android.tools.r8.ir.analysis.value.SingleValue asSingleValue() -> e
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.Sd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.ge:
     1:1:void <init>():23:23 -> <init>
     void forEach(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> a
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo get(com.android.tools.r8.graph.DexEncodedField) -> a
@@ -44371,19 +44745,19 @@
     1:1:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder builder():26:26 -> a
     void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer) -> b
     boolean isEmpty() -> b
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.Rd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder -> com.android.tools.r8.internal.fe:
     java.util.TreeMap infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():44:44 -> <clinit>
     1:3:void <init>():44:46 -> <init>
     1:2:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection$Builder recordInitializationInfo(com.android.tools.r8.graph.DexField,com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo):55:56 -> a
     3:6:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection build():61:64 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.Td:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoFactory -> com.android.tools.r8.internal.he:
     java.util.concurrent.ConcurrentHashMap argumentInitializationInfos -> a
     1:3:void <init>():11:13 -> <init>
     1:3:com.android.tools.r8.ir.optimize.info.field.InstanceFieldArgumentInitializationInfo createArgumentInitializationInfo(int):18:18 -> a
     4:4:com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo createTypeInitializationInfo(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):24:24 -> a
-com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.Vd:
+com.android.tools.r8.ir.optimize.info.field.InstanceFieldTypeInitializationInfo -> com.android.tools.r8.internal.je:
     com.android.tools.r8.ir.analysis.type.ClassTypeElement dynamicLowerBoundType -> a
     com.android.tools.r8.ir.analysis.type.TypeElement dynamicUpperBoundType -> b
     1:3:void <init>(com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.ir.analysis.type.TypeElement):26:28 -> <init>
@@ -44393,7 +44767,7 @@
     22:22:com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):69:69 -> a
     1:6:boolean equals(java.lang.Object):83:88 -> equals
     1:1:int hashCode():75:75 -> hashCode
-com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.aq:
+com.android.tools.r8.ir.optimize.info.field.NonTrivialInstanceFieldInitializationInfoCollection -> com.android.tools.r8.internal.mq:
     java.util.TreeMap infos -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -44409,13 +44783,13 @@
     boolean isEmpty() -> b
     1:1:void forEachWithDeterministicOrder(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):55:55 -> b
     1:4:java.lang.String toString():85:88 -> toString
-com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.aC:
+com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo -> com.android.tools.r8.internal.vC:
     com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo INSTANCE -> a
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:void <init>():20:20 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
     1:1:com.android.tools.r8.ir.optimize.info.field.UnknownInstanceFieldInitializationInfo getInstance():23:23 -> f
-com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.O7:
+com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo -> com.android.tools.r8.internal.T7:
     com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
@@ -44427,7 +44801,7 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():39:39 -> e
     boolean receiverNeverEscapesOutsideConstructorChain() -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.DefaultInstanceInitializerInfo getInstance():24:24 -> g
-com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.Yd:
+com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo -> com.android.tools.r8.internal.me:
     1:1:void <init>():14:14 -> <init>
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection fieldInitializationInfos() -> a
     com.android.tools.r8.ir.optimize.info.initializer.InstanceInitializerInfo rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> a
@@ -44436,7 +44810,7 @@
     boolean mayHaveOtherSideEffectsThanInstanceFieldAssignments() -> d
     com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet() -> e
     boolean receiverNeverEscapesOutsideConstructorChain() -> f
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.dq:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo -> com.android.tools.r8.internal.pq:
     com.android.tools.r8.graph.DexMethod parent -> f
     boolean $assertionsDisabled -> a
     int $r8$clinit -> b
@@ -44461,8 +44835,8 @@
     1:1:com.android.tools.r8.ir.analysis.fieldvalueanalysis.AbstractFieldSet readSet():67:67 -> e
     1:1:boolean receiverNeverEscapesOutsideConstructorChain():82:82 -> f
     1:1:java.lang.String toString():97:97 -> toString
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.bq:
-com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.cq:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$1 -> com.android.tools.r8.internal.nq:
+com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder -> com.android.tools.r8.internal.oq:
     com.android.tools.r8.ir.optimize.info.field.InstanceFieldInitializationInfoCollection instanceFieldInitializationInfos -> b
     com.android.tools.r8.graph.DexMethod parent -> e
     boolean $assertionsDisabled -> a
@@ -44519,7 +44893,7 @@
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setInstanceFieldInitializationMayDependOnEnvironment():170:170 -> e
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setMayHaveOtherSideEffectsThanInstanceFieldAssignments():179:179 -> f
     1:1:com.android.tools.r8.ir.optimize.info.initializer.NonTrivialInstanceInitializerInfo$Builder setReceiverMayEscapeOutsideConstructorChain():184:184 -> g
-com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.N7:
+com.android.tools.r8.ir.optimize.inliner.DefaultInliningReasonStrategy -> com.android.tools.r8.internal.S7:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.conversion.CallSiteInformation callSiteInformation -> c
     com.android.tools.r8.ir.optimize.Inliner inliner -> d
@@ -44531,10 +44905,10 @@
     22:24:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     25:27:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):58:60 -> a
     28:29:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):40:41 -> a
-com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Qa:
+com.android.tools.r8.ir.optimize.inliner.FixedInliningReasonStrategy -> com.android.tools.r8.internal.Za:
     1:1:void <init>(com.android.tools.r8.ir.optimize.Inliner$Reason):15:15 -> <init>
     1:1:com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):22:22 -> a
-com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Hd:
+com.android.tools.r8.ir.optimize.inliner.InlinerUtils -> com.android.tools.r8.internal.Vd:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:4:void collectAllMonitorEnterValues(com.android.tools.r8.ir.code.IRCode,java.util.Set,java.util.Set):20:23 -> a
@@ -44543,7 +44917,7 @@
     7:7:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):33 -> a
     8:8:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):36:36 -> a
     9:9:void addMonitorEnterValue(com.android.tools.r8.ir.code.Value,java.util.Set,java.util.Set):34:34 -> a
-com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Id:
+com.android.tools.r8.ir.optimize.inliner.InliningIRProvider -> com.android.tools.r8.internal.Wd:
     com.android.tools.r8.ir.conversion.MethodProcessor methodProcessor -> e
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
@@ -44561,9 +44935,9 @@
     1:7:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):36:42 -> b
     8:9:com.android.tools.r8.ir.code.IRCode com.android.tools.r8.graph.ProgramMethod.buildInliningIR(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.NumberGenerator,com.android.tools.r8.ir.code.Position,com.android.tools.r8.origin.Origin,com.android.tools.r8.ir.conversion.MethodProcessor):36:37 -> b
     8:9:com.android.tools.r8.ir.code.IRCode getInliningIR(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod):42 -> b
-com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Kd:
+com.android.tools.r8.ir.optimize.inliner.InliningReasonStrategy -> com.android.tools.r8.internal.Yd:
     com.android.tools.r8.ir.optimize.Inliner$Reason computeInliningReason(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod) -> a
-com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.fq:
+com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter -> com.android.tools.r8.internal.rq:
     com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -44601,7 +44975,7 @@
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
     1:1:com.android.tools.r8.ir.optimize.inliner.NopWhyAreYouNotInliningReporter getInstance():21:21 -> y
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.RC:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter -> com.android.tools.r8.internal.HD:
     1:1:void <init>():18:18 -> <init>
     void reportCallerNotSameClass() -> a
     void reportIncorrectArity(int,int) -> a
@@ -44638,7 +45012,7 @@
     void reportRecursiveMethod() -> v
     void reportUnknownTarget() -> w
     boolean unsetReasonHasBeenReportedFlag() -> x
-com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.SC:
+com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporterImpl -> com.android.tools.r8.internal.ID:
     boolean reasonHasBeenReported -> e
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.ProgramMethod callee -> b
@@ -44703,7 +45077,7 @@
     83:83:java.lang.String getCaptureSignature(com.android.tools.r8.graph.DexTypeList):116:116 -> a
     84:84:com.android.tools.r8.graph.DexType lambda$getCaptureSignature$2(com.android.tools.r8.graph.DexTypeList,int):116:116 -> a
     85:110:int mapFieldIntoCaptureIndex(java.lang.String,java.util.List,com.android.tools.r8.graph.DexField):123:148 -> a
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.internal.A6:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor -> com.android.tools.r8.internal.F6:
     com.android.tools.r8.ir.code.IRCode code -> i
     com.android.tools.r8.ir.code.InstructionListIterator instructions -> k
     com.android.tools.r8.graph.DexItemFactory factory -> d
@@ -44799,7 +45173,7 @@
     89:95:java.lang.Void com.android.tools.r8.ir.optimize.lambda.CodeProcessor.visit(com.android.tools.r8.ir.code.Argument):403:409 -> a
     89:95:java.lang.Object visit(com.android.tools.r8.ir.code.Argument):49 -> a
     1:5:void processCode():217:221 -> b
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.internal.y6:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$1 -> com.android.tools.r8.internal.D6:
     1:1:void <init>():86:86 -> <init>
     boolean isValidHolder(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType) -> a
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
@@ -44815,7 +45189,7 @@
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
-com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.internal.z6:
+com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy -> com.android.tools.r8.internal.E6:
     boolean isValidHolder(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType) -> a
     boolean isValidInstanceFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> a
     boolean isValidInvoke(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod) -> a
@@ -44830,7 +45204,7 @@
     boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> b
     boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> c
     boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField) -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.internal.yl:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup -> com.android.tools.r8.internal.Ll:
     java.util.Map lambdas -> d
     com.android.tools.r8.ir.optimize.lambda.LambdaGroupId id -> b
     com.android.tools.r8.graph.DexType classType -> c
@@ -44867,14 +45241,14 @@
     1:2:void remove(com.android.tools.r8.graph.DexType):143:144 -> e
     1:1:boolean isTrivial():134:134 -> f
     1:1:int size():79:79 -> g
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.internal.xl:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaInfo -> com.android.tools.r8.internal.Kl:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     int id -> a
     1:3:void <init>(int,com.android.tools.r8.graph.DexProgramClass):59:61 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.internal.yl$a:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError -> com.android.tools.r8.internal.Ll$a:
     boolean reportable -> a
     1:2:void <init>(java.lang.String,boolean):233:234 -> <init>
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.internal.zl:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupClassBuilder -> com.android.tools.r8.internal.Ml:
     java.lang.String origin -> n
     com.android.tools.r8.graph.DexItemFactory factory -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup group -> l
@@ -44890,9 +45264,9 @@
     com.android.tools.r8.graph.DexTypeList buildInterfaces() -> g
     com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods() -> h
     com.android.tools.r8.graph.DexType getSuperClassType() -> i
-com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.internal.Al:
+com.android.tools.r8.ir.optimize.lambda.LambdaGroupId -> com.android.tools.r8.internal.Nl:
     com.android.tools.r8.ir.optimize.lambda.LambdaGroup createGroup() -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.internal.Jl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger -> com.android.tools.r8.internal.Wl:
     java.util.Map lambdas -> b
     com.android.tools.r8.kotlin.Kotlin kotlin -> g
     java.util.Map groups -> c
@@ -44956,20 +45330,20 @@
     1:1:com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor access$800(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):101:101 -> c
     2:2:void lambda$new$0(com.android.tools.r8.graph.DexType):228:228 -> c
     3:3:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):257:257 -> c
-    4:4:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():414:414 -> c
+    4:4:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():422:422 -> c
     4:4:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):257 -> c
     5:7:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):257:259 -> c
-    8:8:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):92:92 -> c
-    8:8:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):101 -> c
+    8:8:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInBase(com.android.tools.r8.graph.DexProgramClass):93:93 -> c
+    8:8:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInFeature(com.android.tools.r8.graph.DexProgramClass):102 -> c
     8:8:boolean lambda$collectGroupCandidates$2(com.android.tools.r8.graph.DexProgramClass):259 -> c
     1:1:java.util.Map access$900(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):101:101 -> d
     2:2:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):264:264 -> d
-    3:3:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():414:414 -> d
+    3:3:com.android.tools.r8.utils.InternalOptions$TestingOptions com.android.tools.r8.graph.AppView.testing():422:422 -> d
     3:3:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):265 -> d
     4:16:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):265:277 -> d
     17:17:void lambda$collectGroupCandidates$4(com.android.tools.r8.graph.DexProgramClass):272:272 -> d
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.internal.Cl:
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.internal.Dl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1 -> com.android.tools.r8.internal.Pl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalysisStrategy -> com.android.tools.r8.internal.Ql:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> m
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):502:502 -> <init>
     2:6:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):503:507 -> <init>
@@ -44983,12 +45357,12 @@
     7:7:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.StaticGet):539:539 -> a
     8:8:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.InitClass):544:544 -> a
     9:9:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):549:549 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.internal.El:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$AnalyzeMode -> com.android.tools.r8.internal.Rl:
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> a
     1:1:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger):115:115 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):115:115 -> <init>
     1:1:void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode):119:119 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.internal.Fl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyMode -> com.android.tools.r8.internal.Sl:
     java.util.Map lambdaGroups -> b
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> c
     boolean $assertionsDisabled -> a
@@ -44997,7 +45371,7 @@
     1:3:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger,java.util.Map,com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer):130:132 -> <init>
     1:32:void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):142:173 -> a
     33:36:void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider):172:175 -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.internal.Gl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy -> com.android.tools.r8.internal.Tl:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer optimizationInfoFixer -> n
     java.util.Set typeAffectedValues -> o
@@ -45018,7 +45392,7 @@
     12:12:void process(com.android.tools.r8.ir.optimize.lambda.CodeProcessor$Strategy,com.android.tools.r8.ir.code.Argument):673:673 -> a
     1:42:void processCode():584:625 -> b
     43:43:boolean typeMayHaveChanged(com.android.tools.r8.ir.code.Value):629:629 -> b
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.internal.Hl:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer -> com.android.tools.r8.internal.Ul:
     java.util.Map lambdaGroupsClasses -> b
     com.android.tools.r8.ir.optimize.lambda.LambdaMerger this$0 -> c
     boolean $assertionsDisabled -> a
@@ -45035,12 +45409,12 @@
     1:1:java.lang.Object apply(java.lang.Object):677:677 -> apply
     2:6:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.lambda.LambdaMerger$LambdaMergerOptimizationInfoFixer.apply(com.android.tools.r8.graph.DexType):688:692 -> apply
     2:6:java.lang.Object apply(java.lang.Object):677 -> apply
-com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.internal.Il:
+com.android.tools.r8.ir.optimize.lambda.LambdaMerger$Mode -> com.android.tools.r8.internal.Vl:
     1:1:void <init>():103:103 -> <init>
     2:2:void <init>(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$1):103:103 -> <init>
     void analyzeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode) -> a
     void rewriteCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.Inliner,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider) -> a
-com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.internal.Nl:
+com.android.tools.r8.ir.optimize.lambda.LambdaTypeVisitor -> com.android.tools.r8.internal.am:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.util.function.Consumer onLambdaType -> d
     java.util.function.Predicate isLambdaType -> c
@@ -45418,11 +45792,11 @@
     1:36:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():107:142 -> h
     37:40:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):190:193 -> h
     37:40:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
-    41:41:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():270:270 -> h
+    41:41:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():271:271 -> h
     41:41:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):193 -> h
     41:41:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
-    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> h
-    42:42:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():275 -> h
+    42:42:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> h
+    42:42:int com.android.tools.r8.utils.InternalOptions.verificationSizeLimitInBytes():276 -> h
     42:42:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):193 -> h
     42:42:com.android.tools.r8.graph.DexEncodedMethod[] buildVirtualMethods():142 -> h
     43:46:void splitIntoGroupsBasedOnInstructionSize(java.util.List,com.android.tools.r8.utils.TriConsumer):196:199 -> h
@@ -45450,62 +45824,50 @@
     8:10:boolean isValidVirtualCall(com.android.tools.r8.ir.code.InvokeMethod):111:113 -> a
     11:11:boolean isValidHolder(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):125:125 -> a
     12:19:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):131:138 -> a
-    20:20:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    20:20:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):137 -> a
-    21:26:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):137:142 -> a
-    27:29:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):147:149 -> a
-    30:34:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):245:249 -> a
-    30:34:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    35:35:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    35:35:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):249 -> a
-    35:35:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    36:45:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):250:259 -> a
-    36:45:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    46:47:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):290:291 -> a
-    46:47:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
-    46:47:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    48:48:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup.id():27:27 -> a
-    48:48:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):291 -> a
-    48:48:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
-    48:48:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    49:51:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):291:293 -> a
-    49:51:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
-    49:51:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    52:52:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):292:292 -> a
-    52:52:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
-    52:52:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    53:53:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):260:260 -> a
-    53:53:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    54:62:java.util.List mapInitializerArgs(com.android.tools.r8.ir.code.Value,java.util.List,com.android.tools.r8.graph.DexProto):275:283 -> a
-    54:62:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):260 -> a
-    54:62:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    20:25:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.NewInstance):137:142 -> a
+    26:28:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):147:149 -> a
+    29:43:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):245:259 -> a
+    29:43:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    44:45:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):290:291 -> a
+    44:45:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
+    44:45:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    46:46:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup.id():27:27 -> a
+    46:46:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):291 -> a
+    46:46:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
+    46:46:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    47:49:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):291:293 -> a
+    47:49:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
+    47:49:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    50:50:com.android.tools.r8.graph.DexMethod mapInitializerMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):292:292 -> a
+    50:50:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):259 -> a
+    50:50:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    51:51:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):260:260 -> a
+    51:51:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    52:60:java.util.List mapInitializerArgs(com.android.tools.r8.ir.code.Value,java.util.List,com.android.tools.r8.graph.DexProto):275:283 -> a
+    52:60:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):260 -> a
+    52:60:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    61:61:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):261:261 -> a
+    61:61:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
+    62:62:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
+    62:62:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):261 -> a
+    62:62:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
     63:63:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):261:261 -> a
     63:63:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    64:64:void com.android.tools.r8.ir.code.InvokeDirect.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Value,java.util.List):38:38 -> a
-    64:64:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):261 -> a
-    64:64:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    65:65:void patchInitializer(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeDirect):261:261 -> a
-    65:65:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):149 -> a
-    66:68:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):152:154 -> a
-    69:69:com.android.tools.r8.graph.DexMethod mapVirtualMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):298:298 -> a
-    69:69:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):154 -> a
-    70:78:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):156:164 -> a
-    79:80:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):170:171 -> a
-    81:81:com.android.tools.r8.graph.DexField mapCaptureField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):303:303 -> a
-    81:81:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):171 -> a
-    82:109:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):173:200 -> a
-    110:111:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):206:207 -> a
-    112:112:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):308:308 -> a
-    112:112:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):207 -> a
-    113:116:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):209:212 -> a
-    117:117:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    117:117:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):211 -> a
-    118:124:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):211:217 -> a
-    125:126:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InitClass):222:223 -> a
-    127:127:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    127:127:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InitClass):223 -> a
-    128:129:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InitClass):223:224 -> a
-    130:135:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.Argument):230:235 -> a
+    64:66:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):152:154 -> a
+    67:67:com.android.tools.r8.graph.DexMethod mapVirtualMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):298:298 -> a
+    67:67:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):154 -> a
+    68:76:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InvokeMethod):156:164 -> a
+    77:78:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):170:171 -> a
+    79:79:com.android.tools.r8.graph.DexField mapCaptureField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexField):303:303 -> a
+    79:79:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):171 -> a
+    80:107:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InstanceGet):173:200 -> a
+    108:109:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):206:207 -> a
+    110:110:com.android.tools.r8.graph.DexField mapSingletonInstanceField(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexField):308:308 -> a
+    110:110:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):207 -> a
+    111:114:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):209:212 -> a
+    115:121:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.StaticGet):211:217 -> a
+    122:124:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.InitClass):222:224 -> a
+    125:130:void patch(com.android.tools.r8.ir.optimize.lambda.LambdaMerger$ApplyStrategy,com.android.tools.r8.ir.code.Argument):230:235 -> a
     1:4:boolean isValidStaticFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):63:66 -> b
     5:14:boolean isValidInitializerCall(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.ir.code.InvokeMethod):98:107 -> b
     15:15:com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroup.id():27:27 -> b
@@ -45514,8 +45876,7 @@
     17:17:boolean isValidInitClass(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):118:118 -> b
     1:1:boolean isValidInstanceFieldRead(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):81:81 -> c
     2:5:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):267:270 -> c
-    6:6:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> c
-    6:6:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):269 -> c
+    6:6:com.android.tools.r8.ir.code.Value createValueForType(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexType):269:269 -> c
     1:8:boolean isValidStaticFieldWrite(com.android.tools.r8.ir.optimize.lambda.CodeProcessor,com.android.tools.r8.graph.DexField):51:58 -> d
 com.android.tools.r8.ir.optimize.lambda.kotlin.KotlinLambdaGroupId -> com.android.tools.r8.ir.optimize.g.a.t:
     java.lang.String signature -> f
@@ -45572,7 +45933,7 @@
     95:95:void com.android.tools.r8.ir.optimize.lambda.LambdaGroup$LambdaStructureError.<init>(java.lang.String):229:229 -> a
     95:95:void validateDirectMethods(com.android.tools.r8.graph.DexClass):167 -> a
     96:96:void validateDirectMethods(com.android.tools.r8.graph.DexClass):167:167 -> a
-    97:97:boolean com.android.tools.r8.graph.DexEncodedField.hasAnnotation():200:200 -> a
+    97:97:boolean com.android.tools.r8.graph.DexEncodedField.hasAnnotation():201:201 -> a
     97:97:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):219 -> a
     98:100:void checkFieldAnnotations(com.android.tools.r8.graph.DexEncodedField):220:222 -> a
     101:101:java.lang.String com.android.tools.r8.graph.DexItem.toSmaliString():44:44 -> a
@@ -45677,7 +46038,7 @@
     28:34:void com.android.tools.r8.ir.optimize.library.BooleanMethodOptimizer.optimizeValueOf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):97:97 -> a
     28:34:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):49 -> a
     1:1:com.android.tools.r8.graph.DexType getType():34:34 -> getType
-com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.C9:
+com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer -> com.android.tools.r8.internal.L9:
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):25:26 -> <init>
     1:2:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):41:42 -> a
@@ -45689,20 +46050,20 @@
     26:27:void com.android.tools.r8.ir.optimize.library.EnumMethodOptimizer.insertAssumeDynamicType(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):74:75 -> a
     26:27:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):43 -> a
     1:1:com.android.tools.r8.graph.DexType getType():31:31 -> getType
-com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.em:
+com.android.tools.r8.ir.optimize.library.LibraryFieldSynthesis -> com.android.tools.r8.internal.rm:
     1:2:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):29:30 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     3:3:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
     4:73:com.android.tools.r8.graph.DexLibraryClass com.android.tools.r8.graph.DexLibraryClass.asLibraryClassOrNull(com.android.tools.r8.graph.DexClass):0:69 -> a
     4:73:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):31 -> a
     74:74:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33:33 -> a
-    75:76:void com.android.tools.r8.graph.DexItemFactory$EnumMembers.forEachField(java.util.function.Consumer):1307:1308 -> a
+    75:76:void com.android.tools.r8.graph.DexItemFactory$EnumMembers.forEachField(java.util.function.Consumer):1317:1318 -> a
     75:76:void synthesizeEnumFields(com.android.tools.r8.graph.AppView):33 -> a
     77:85:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):35:43 -> a
     86:86:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
     86:86:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):43 -> a
     87:87:void lambda$synthesizeEnumFields$0(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexField):37:37 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.fm:
+com.android.tools.r8.ir.optimize.library.LibraryMemberOptimizer -> com.android.tools.r8.internal.sm:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set finalLibraryFields -> c
     java.util.Set modeledLibraryTypes -> d
@@ -45716,7 +46077,7 @@
     4:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     4:93:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):68 -> a
     94:94:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):68:68 -> a
-    95:95:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():166:166 -> a
+    95:95:boolean com.android.tools.r8.graph.DexEncodedField.isFinal():167:167 -> a
     95:95:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):70 -> a
     96:98:void lambda$initializeFinalLibraryFields$0(com.android.tools.r8.graph.DexField):71:73 -> a
     99:99:boolean isFinalLibraryField(com.android.tools.r8.graph.DexEncodedField):82:82 -> a
@@ -45734,9 +46095,9 @@
     121:121:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
     121:121:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):128 -> a
     122:122:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodProcessingId):128:128 -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.gm:
+com.android.tools.r8.ir.optimize.library.LibraryMethodModelCollection -> com.android.tools.r8.internal.tm:
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set) -> a
-com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.km:
+com.android.tools.r8.ir.optimize.library.LibraryMethodSideEffectModelCollection -> com.android.tools.r8.internal.xm:
     java.util.Map finalMethodsWithoutSideEffects -> a
     java.util.Set nonFinalMethodsWithoutSideEffects -> b
     1:3:void <init>(com.android.tools.r8.graph.DexItemFactory):25:27 -> <init>
@@ -45747,7 +46108,7 @@
     24:26:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):79 -> a
     27:28:boolean isSideEffectFree(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.LibraryMethod):79:80 -> a
     1:1:java.util.Set buildNonFinalMethodsWithoutSideEffects(com.android.tools.r8.graph.DexItemFactory):55:55 -> b
-com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.mm:
+com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer -> com.android.tools.r8.internal.zm:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> c
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.ir.analysis.value.AbstractValueFactory abstractValueFactory -> a
@@ -45776,7 +46137,7 @@
     76:76:void run(java.util.Set):45 -> a
     77:77:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):79:79 -> a
     77:77:void run(java.util.Set):46 -> a
-    78:78:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
+    78:78:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
     78:78:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):80 -> a
     78:78:void run(java.util.Set):46 -> a
     79:79:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelStaticFinalLibraryFields(java.util.Set):81:81 -> a
@@ -45804,7 +46165,7 @@
     179:182:void run(java.util.Set):48 -> a
     183:183:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():115:115 -> a
     183:183:void run(java.util.Set):49 -> a
-    184:184:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1153:1153 -> a
+    184:184:java.lang.Iterable com.android.tools.r8.graph.DexItemFactory$ObjectsMethods.requireNonNullMethods():1156:1156 -> a
     184:184:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():115 -> a
     184:184:void run(java.util.Set):49 -> a
     185:196:void com.android.tools.r8.ir.optimize.library.LibraryOptimizationInfoInitializer.modelRequireNonNullMethods():115:126 -> a
@@ -45813,7 +46174,7 @@
     198:287:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     198:287:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):132 -> a
     288:290:com.android.tools.r8.graph.DexEncodedMethod lookupMethod(com.android.tools.r8.graph.DexMethod):133:135 -> a
-com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.ir.optimize.library.LogMethodOptimizer -> com.android.tools.r8.internal.jn:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexMethod wtfMethod -> i
     com.android.tools.r8.graph.DexMethod eMethod -> h
@@ -45835,28 +46196,28 @@
     4:38:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):109:143 -> a
     39:42:void replaceInvokeWithConstNumber(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,int):150:153 -> a
     1:1:com.android.tools.r8.graph.DexType getType():99:99 -> getType
-com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.internal.eq:
+com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection -> com.android.tools.r8.internal.qq:
     com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection INSTANCE -> a
     1:1:void <clinit>():18:18 -> <clinit>
     1:1:void <init>():21:21 -> <init>
     void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set) -> a
     1:1:com.android.tools.r8.ir.optimize.library.NopLibraryMethodModelCollection getInstance():24:24 -> a
     1:1:com.android.tools.r8.graph.DexType getType():29:29 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.ur:
+com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer -> com.android.tools.r8.internal.Gr:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):37:37 -> a
     2:4:void com.android.tools.r8.ir.optimize.library.ObjectMethodOptimizer.optimizeGetClass(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):43:45 -> a
     2:4:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):38 -> a
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> getType
-com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.Er:
+com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer -> com.android.tools.r8.internal.Qr:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):21:22 -> <init>
     1:1:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):37:37 -> a
     2:10:void com.android.tools.r8.ir.optimize.library.ObjectsMethodOptimizer.optimizeRequireNonNull(com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,java.util.Set):44:52 -> a
     2:10:void optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexClassAndMethod,java.util.Set):38 -> a
     1:1:com.android.tools.r8.graph.DexType getType():27:27 -> getType
-com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.dz:
+com.android.tools.r8.ir.optimize.library.StringMethodOptimizer -> com.android.tools.r8.internal.wz:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.AppView appView -> a
     1:3:void <init>(com.android.tools.r8.graph.AppView):26:28 -> <init>
@@ -45888,7 +46249,7 @@
 com.android.tools.r8.ir.optimize.peepholes.BasicBlockPeephole -> com.android.tools.r8.internal.d2:
     boolean match(com.android.tools.r8.ir.code.InstructionListIterator) -> a
     boolean resetAfterMatch() -> a
-com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.b9:
+com.android.tools.r8.ir.optimize.peepholes.DupDupDupPeephole -> com.android.tools.r8.internal.k9:
     com.android.tools.r8.ir.optimize.peepholes.Point dup3Exp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point dup2Exp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point dup1Exp -> a
@@ -45899,7 +46260,7 @@
     2:2:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     boolean resetAfterMatch() -> a
     3:36:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:74 -> a
-    37:37:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    37:37:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     37:37:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):75 -> a
     38:71:void com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper.resetPrevious(com.android.tools.r8.ir.code.InstructionListIterator,int):0:33 -> a
     38:71:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):78 -> a
@@ -45909,7 +46270,7 @@
     1:1:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> c
     1:1:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35 -> c
     2:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):35:35 -> c
-com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.Qm:
+com.android.tools.r8.ir.optimize.peepholes.LoadLoadDupPeephole -> com.android.tools.r8.internal.dn:
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoadExp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point lastLoadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
@@ -45918,12 +46279,12 @@
     1:8:void <init>():30:37 -> <init>
     boolean resetAfterMatch() -> a
     1:24:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):41:64 -> a
-    25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    25:25:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     25:25:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):64 -> a
-com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.Pn:
+com.android.tools.r8.ir.optimize.peepholes.Match -> com.android.tools.r8.internal.bo:
     java.util.List instructions -> a
     1:3:void <init>(com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[],java.util.List):14:16 -> <init>
-com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.Uo:
+com.android.tools.r8.ir.optimize.peepholes.MoveLoadUpPeephole -> com.android.tools.r8.internal.gp:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> g
     com.android.tools.r8.ir.code.Instruction insertPosition -> d
     com.android.tools.r8.ir.optimize.peepholes.Point firstLoad -> e
@@ -45957,12 +46318,12 @@
     12:12:boolean com.android.tools.r8.ir.code.Instruction.isDebugPosition():0:0 -> b
     12:12:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):59 -> b
     13:13:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):60:60 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.rs:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression -> com.android.tools.r8.internal.Ds:
     int getMin() -> a
     void setIndex(int) -> a
     java.util.function.Predicate getPredicate() -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.ss:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeHelper -> com.android.tools.r8.internal.Es:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():14:14 -> <clinit>
     1:1:java.util.function.Predicate withoutLocalInfo(java.util.function.Predicate):17:17 -> a
@@ -45973,7 +46334,7 @@
     23:23:boolean lambda$moveInstructionsUpToCurrentPosition$1(java.util.List,com.android.tools.r8.ir.code.Instruction):66:66 -> a
     1:4:int numberOfValuesPutOnStack(com.android.tools.r8.ir.code.Instruction):38:41 -> b
     5:5:boolean lambda$moveInstructionsUpToCurrentPosition$2(java.util.List,com.android.tools.r8.ir.code.Instruction):72:72 -> b
-com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.ts:
+com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout -> com.android.tools.r8.internal.Fs:
     com.android.tools.r8.ir.optimize.peepholes.PeepholeExpression[] expressions -> b
     java.util.List instructions -> a
     boolean backwards -> c
@@ -45988,7 +46349,7 @@
     1:1:com.android.tools.r8.ir.code.Instruction lambda$test$4(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> e
     1:1:void lambda$test$5(com.android.tools.r8.ir.code.InstructionListIterator):40:40 -> f
     1:4:com.android.tools.r8.ir.optimize.peepholes.Match test(com.android.tools.r8.ir.code.InstructionListIterator):37:40 -> g
-com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.Bs:
+com.android.tools.r8.ir.optimize.peepholes.Point -> com.android.tools.r8.internal.Ns:
     java.util.function.Predicate predicate -> b
     boolean $assertionsDisabled -> a
     int index -> c
@@ -46000,7 +46361,7 @@
     3:3:com.android.tools.r8.ir.code.Instruction get(com.android.tools.r8.ir.optimize.peepholes.Match):41:41 -> a
     1:1:java.util.function.Predicate getPredicate():21:21 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.Qw:
+com.android.tools.r8.ir.optimize.peepholes.RemoveDebugPositionPeephole -> com.android.tools.r8.internal.jx:
     com.android.tools.r8.ir.optimize.peepholes.Point secondInstructionExp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point debugPositionExp -> b
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> d
@@ -46010,14 +46371,14 @@
     boolean lambda$match$0(com.android.tools.r8.ir.code.DebugPosition,com.android.tools.r8.ir.code.Instruction) -> a
     boolean resetAfterMatch() -> a
     1:33:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):52:84 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.Oy:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadPeephole -> com.android.tools.r8.internal.hz:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> b
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> c
     1:6:void <init>():22:27 -> <init>
     boolean resetAfterMatch() -> a
     1:18:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):31:48 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.Py:
+com.android.tools.r8.ir.optimize.peepholes.StoreLoadToDupStorePeephole -> com.android.tools.r8.internal.iz:
     com.android.tools.r8.ir.optimize.peepholes.Point loadExp -> c
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> b
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> e
@@ -46035,7 +46396,7 @@
     23:23:boolean com.android.tools.r8.ir.code.Instruction.isDup():0:0 -> a
     23:23:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62 -> a
     24:42:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):62:80 -> a
-com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.Qy:
+com.android.tools.r8.ir.optimize.peepholes.StoreSequenceLoadPeephole -> com.android.tools.r8.internal.jz:
     com.android.tools.r8.ir.optimize.peepholes.Point storeExp -> c
     com.android.tools.r8.ir.code.Store store -> a
     com.android.tools.r8.ir.optimize.peepholes.PeepholeLayout layout -> f
@@ -46049,7 +46410,7 @@
     2:8:boolean lambda$new$0(com.android.tools.r8.ir.code.Instruction):43:49 -> a
     boolean resetAfterMatch() -> a
     9:49:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):85:125 -> a
-    50:50:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    50:50:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     50:50:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):125 -> a
     51:51:boolean match(com.android.tools.r8.ir.code.InstructionListIterator):126:126 -> a
     1:1:boolean lambda$new$1(com.android.tools.r8.ir.code.Instruction):56:56 -> b
@@ -46060,7 +46421,7 @@
     2:2:boolean com.android.tools.r8.ir.code.Instruction.isLoad():0:0 -> c
     2:2:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):73 -> c
     3:4:boolean lambda$new$2(com.android.tools.r8.ir.code.Instruction):74:75 -> c
-com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.VC:
+com.android.tools.r8.ir.optimize.peepholes.Wildcard -> com.android.tools.r8.internal.LD:
     java.util.function.Predicate predicate -> b
     boolean $assertionsDisabled -> a
     int index -> c
@@ -46072,7 +46433,7 @@
     3:3:java.util.List get(com.android.tools.r8.ir.optimize.peepholes.Match):42:42 -> a
     1:1:java.util.function.Predicate getPredicate():22:22 -> b
     int getMax() -> c
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.Z5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer -> com.android.tools.r8.internal.d6:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     java.util.concurrent.ConcurrentHashMap candidates -> f
@@ -46096,7 +46457,7 @@
     97:98:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):143:144 -> a
     99:100:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
     99:100:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):145 -> a
-    101:101:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    101:101:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
     101:101:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):147 -> a
     102:102:void lambda$collectCandidates$0(java.util.Map,java.util.Set,com.android.tools.r8.graph.DexProgramClass):148:148 -> a
     103:104:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer.markNotEligible(com.android.tools.r8.graph.DexType,java.util.Set):187:188 -> a
@@ -46182,8 +46543,8 @@
     439:442:boolean isSelectedValueUsersValid(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo,com.android.tools.r8.ir.code.Value,boolean,java.util.Set):615:618 -> a
     443:443:void staticizeCandidates(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):690:690 -> a
     1:1:boolean lambda$isValidValueUser$4(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.Value):643:643 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.W5:
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.X5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1 -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator -> com.android.tools.r8.internal.b6:
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer this$0 -> c
     1:1:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$1):693:693 -> <init>
     2:3:void <init>(com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer,com.android.tools.r8.graph.DexItemFactory):695:696 -> <init>
@@ -46192,20 +46553,20 @@
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):731:731 -> b
     1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):726:726 -> c
     2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):741:741 -> c
+    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):766:768 -> c
+    3:5:void registerInitClass(com.android.tools.r8.graph.DexType):711 -> c
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):736:736 -> d
     2:4:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):766:768 -> d
-    2:4:void registerInitClass(com.android.tools.r8.graph.DexType):711 -> d
+    2:4:void registerInstanceOf(com.android.tools.r8.graph.DexType):774 -> d
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):716:716 -> e
     2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):756:756 -> e
     3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):766:768 -> e
-    3:5:void registerInstanceOf(com.android.tools.r8.graph.DexType):774 -> e
+    3:5:void registerNewInstance(com.android.tools.r8.graph.DexType):751 -> e
     1:2:void registerMethod(com.android.tools.r8.graph.DexMethod):700:701 -> f
-    3:5:void com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CallSiteReferencesInvalidator.registerTypeReference(com.android.tools.r8.graph.DexType):766:768 -> f
-    3:5:void registerNewInstance(com.android.tools.r8.graph.DexType):751 -> f
+    3:5:void registerTypeReference(com.android.tools.r8.graph.DexType):766:768 -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):761:761 -> g
-    2:4:void registerTypeReference(com.android.tools.r8.graph.DexType):766:768 -> g
     1:2:void registerField(com.android.tools.r8.graph.DexField):705:706 -> i
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.Y5:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo -> com.android.tools.r8.internal.c6:
     java.util.concurrent.atomic.AtomicInteger fieldWrites -> e
     java.util.concurrent.atomic.AtomicInteger instancesCreated -> f
     java.util.concurrent.atomic.AtomicReference constructor -> g
@@ -46221,17 +46582,17 @@
     1:1:com.android.tools.r8.graph.DexProgramClass hostClass():91:91 -> a
     2:2:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo.hostType():87:87 -> a
     2:2:com.android.tools.r8.graph.DexProgramClass hostClass():91 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     3:3:com.android.tools.r8.graph.DexProgramClass hostClass():91 -> a
     4:5:com.android.tools.r8.graph.DexProgramClass hostClass():91:92 -> a
     1:1:com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer$CandidateInfo invalidate():97:97 -> b
-com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.a6:
+com.android.tools.r8.ir.optimize.staticizer.ClassStaticizerGraphLens -> com.android.tools.r8.internal.e6:
     boolean $assertionsDisabled -> m
     1:1:void <clinit>():15:15 -> <clinit>
     1:7:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):22:28 -> <init>
     8:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):21:21 -> <init>
     1:3:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):33:35 -> b
-com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.My:
+com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor -> com.android.tools.r8.internal.fz:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer classStaticizer -> c
     com.android.tools.r8.graph.AppView appView -> b
@@ -46280,7 +46641,7 @@
     207:296:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     207:296:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):335 -> a
     207:296:void prepareCandidates(java.util.Map):326 -> a
-    297:297:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    297:297:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     297:297:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     297:297:boolean com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.validMethods(com.android.tools.r8.utils.collections.ProgramMethodSet):335 -> a
     297:297:void prepareCandidates(java.util.Map):326 -> a
@@ -46314,31 +46675,28 @@
     448:448:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):652:652 -> a
     449:449:boolean com.android.tools.r8.ir.code.Instruction.isAssume():0:0 -> a
     449:449:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):653 -> a
-    450:455:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):656:661 -> a
-    456:456:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> a
-    456:456:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):661 -> a
-    457:464:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):662:669 -> a
-    465:465:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
+    450:463:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):656:669 -> a
+    464:464:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
+    464:464:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):668 -> a
+    465:465:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    465:465:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
     465:465:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):668 -> a
-    466:466:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    466:466:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
-    466:466:void fixupStaticizedValueUsers(com.android.tools.r8.ir.code.IRCode,java.util.Set):668 -> a
-    467:467:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):728:728 -> a
-    468:468:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
-    468:468:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730 -> a
-    469:471:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730:732 -> a
-    472:472:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
-    472:472:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734 -> a
-    473:473:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734:734 -> a
-    474:477:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):783:786 -> a
-    478:478:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):785:785 -> a
-    479:479:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):786:786 -> a
-    480:484:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):792:796 -> a
-    485:485:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):870:870 -> a
-    486:486:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
-    486:486:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):871 -> a
-    487:488:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):872:873 -> a
-    489:489:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):871:871 -> a
+    466:466:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):728:728 -> a
+    467:467:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
+    467:467:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730 -> a
+    468:470:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):730:732 -> a
+    471:471:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
+    471:471:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734 -> a
+    472:472:com.android.tools.r8.graph.DexField mapFieldIfMoved(com.android.tools.r8.graph.DexField):734:734 -> a
+    473:476:boolean classMembersConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):783:786 -> a
+    477:477:boolean lambda$classMembersConflict$14(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):785:785 -> a
+    478:478:boolean lambda$classMembersConflict$15(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):786:786 -> a
+    479:483:boolean hasMembersNotStaticized(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.collections.ProgramMethodSet):792:796 -> a
+    484:484:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):870:870 -> a
+    485:485:com.android.tools.r8.graph.DexItemFactory com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.factory():878:878 -> a
+    485:485:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):871 -> a
+    486:487:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):872:873 -> a
+    488:488:com.android.tools.r8.graph.DexField mapCandidateField(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):871:871 -> a
     1:28:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):103:130 -> b
     29:40:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():740:751 -> b
     29:40:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
@@ -46352,7 +46710,7 @@
     51:51:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     52:53:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():764:765 -> b
     52:53:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
-    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    54:54:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     54:54:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():765 -> b
     54:54:void run(com.android.tools.r8.ir.optimize.info.OptimizationFeedback,java.util.concurrent.ExecutorService):134 -> b
     55:58:com.android.tools.r8.utils.collections.ProgramMethodSet com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.staticizeMethodSymbols():765:768 -> b
@@ -46387,18 +46745,15 @@
     167:173:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):437:443 -> b
     174:174:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):300:300 -> b
     174:174:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):444 -> b
-    175:177:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):446:448 -> b
-    178:178:com.android.tools.r8.ir.code.Value com.android.tools.r8.ir.code.IRCode.createValue(com.android.tools.r8.ir.analysis.type.TypeElement):1105:1105 -> b
-    178:178:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):449 -> b
-    179:179:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):449:449 -> b
-    180:180:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> b
+    175:178:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):446:449 -> b
+    179:179:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> b
+    179:179:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):448 -> b
+    180:180:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> b
+    180:180:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> b
     180:180:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):448 -> b
-    181:181:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
-    181:181:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> b
-    181:181:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):448 -> b
-    182:182:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):300:300 -> b
-    182:182:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):451 -> b
-    183:183:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):457:457 -> b
+    181:181:void com.android.tools.r8.ir.code.Instruction.removeOrReplaceByDebugLocalRead(com.android.tools.r8.ir.code.IRCode):300:300 -> b
+    181:181:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):451 -> b
+    182:182:void removeCandidateInstantiation(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):457:457 -> b
     1:1:boolean lambda$finalEligibilityCheck$6(com.android.tools.r8.graph.DexEncodedMethod):226:226 -> c
     2:2:void removeReferencesToThis(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):461:461 -> c
     1:11:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):468:478 -> d
@@ -46422,12 +46777,12 @@
     41:43:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     44:44:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):687:687 -> d
     44:44:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    45:45:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
+    45:45:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> d
     45:45:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):685 -> d
     45:45:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     46:50:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):696:700 -> d
     46:50:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    51:51:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
+    51:51:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> d
     51:51:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):700 -> d
     51:51:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     52:55:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):705:708 -> d
@@ -46441,7 +46796,7 @@
     66:68:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
     69:73:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):716:720 -> d
     69:73:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
-    74:74:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> d
+    74:74:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> d
     74:74:void com.android.tools.r8.ir.optimize.staticizer.StaticizingProcessor.remapMovedCandidates(com.android.tools.r8.ir.code.IRCode):720 -> d
     74:74:void rewriteReferences(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):498 -> d
 com.android.tools.r8.ir.optimize.string.StringBuilderAppendFlowAnalysis -> com.android.tools.r8.ir.optimize.string.d:
@@ -46584,7 +46939,7 @@
     2:5:void <init>(com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer,com.android.tools.r8.ir.code.Value):873:876 -> <init>
     1:1:void logEscapingRoute(boolean):881:881 -> a
     2:11:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):891:900 -> a
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     12:12:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):900 -> a
     13:13:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     13:13:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):901 -> a
@@ -46628,12 +46983,12 @@
     232:1256:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):579 -> a
     1257:1292:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):580:615 -> a
     1293:1297:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):614:618 -> a
-    1298:1298:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1298:1298:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     1298:1298:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):617 -> a
     1299:1300:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):619:620 -> a
     1301:1305:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):591:595 -> a
     1306:1310:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):593:597 -> a
-    1311:1311:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    1311:1311:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     1311:1311:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):596 -> a
     1312:1337:com.android.tools.r8.ir.optimize.string.StringBuilderOptimizer$StringConcatenationAnalysis applyConcatenationResults(java.util.Set):599:624 -> a
     1338:1338:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
@@ -46668,7 +47023,7 @@
     2:40:java.lang.Number extractConstantNumber(com.android.tools.r8.ir.code.Value):472:510 -> b
     1:1:java.util.Map getBuilderState(com.android.tools.r8.ir.code.Value):317:317 -> c
     1:1:java.util.Map lambda$createBuilderState$0(com.android.tools.r8.ir.code.Value):312:312 -> d
-com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.fz:
+com.android.tools.r8.ir.optimize.string.StringOptimizer -> com.android.tools.r8.internal.yz:
     com.android.tools.r8.graph.DexItemFactory factory -> c
     com.android.tools.r8.graph.AppView appView -> b
     int numberOfSimplifiedConversions -> j
@@ -46695,32 +47050,32 @@
     60:60:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):153 -> a
     61:94:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):154:187 -> a
     95:99:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):186:190 -> a
-    100:100:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    100:100:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     100:100:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):189 -> a
     101:107:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):191:197 -> a
     108:108:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     108:108:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):197 -> a
     109:113:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):200:204 -> a
     114:117:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):203:206 -> a
-    118:118:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    118:118:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     118:118:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):206 -> a
     119:167:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):207:255 -> a
     168:168:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     168:168:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):256 -> a
     169:178:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):257:266 -> a
-    179:179:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
+    179:179:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
     179:179:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):267 -> a
     180:182:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):269:271 -> a
     183:183:boolean com.android.tools.r8.ir.code.Instruction.isConstString():0:0 -> a
     183:183:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):272 -> a
     184:187:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):273:276 -> a
-    188:188:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
+    188:188:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
     188:188:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):277 -> a
     189:197:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):279:287 -> a
-    198:198:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1125:1125 -> a
+    198:198:com.android.tools.r8.ir.code.ConstNumber com.android.tools.r8.ir.code.IRCode.createIntConstant(int):1122:1122 -> a
     198:198:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):288 -> a
     199:199:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):291:291 -> a
-    200:200:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    200:200:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     200:200:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):292 -> a
     201:202:void computeTrivialOperationsOnConstString(com.android.tools.r8.ir.code.IRCode):295:296 -> a
     203:203:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> a
@@ -46733,26 +47088,26 @@
     215:215:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.ir.code.IRCode.instructionListIterator():1024:1024 -> a
     215:215:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):307 -> a
     216:223:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):308:315 -> a
-    224:224:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1227:1227 -> a
+    224:224:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
     224:224:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):315 -> a
     225:244:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):319:338 -> a
     245:245:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
     245:245:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):339 -> a
     246:255:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):340:349 -> a
-    256:256:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    256:256:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     256:256:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):352 -> a
     257:315:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):357:415 -> a
     316:317:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):396:397 -> a
-    318:318:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    318:318:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     318:318:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):398 -> a
     319:347:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):418:446 -> a
     348:350:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):445:447 -> a
-    351:351:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    351:351:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     351:351:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):448 -> a
     352:358:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.graph.DexString):474:480 -> a
     352:358:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):449 -> a
     359:359:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):451:451 -> a
-    360:360:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
+    360:360:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
     360:360:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):452 -> a
     361:362:void com.android.tools.r8.ir.optimize.string.StringOptimizer.logHistogramOfNames(com.android.tools.r8.ir.code.DexItemBasedConstString):495:496 -> a
     361:362:void rewriteClassGetName(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):453 -> a
@@ -46777,7 +47132,7 @@
     17:17:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):512 -> b
     18:37:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):513:532 -> b
     38:41:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):531:534 -> b
-    42:42:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> b
+    42:42:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> b
     42:42:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):535 -> b
     43:80:void removeTrivialConversions(com.android.tools.r8.ir.code.IRCode):536:573 -> b
     81:81:void com.android.tools.r8.ir.analysis.type.TypeAnalysis.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
@@ -46792,13 +47147,13 @@
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$7(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):228:228 -> h
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$8(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):230:230 -> i
     1:1:java.lang.Integer lambda$computeTrivialOperationsOnConstString$9(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString):232:232 -> j
-com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.ez:
+com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration -> com.android.tools.r8.internal.xz:
     com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():580:580 -> <clinit>
     1:1:void <init>():583:583 -> <init>
     1:1:com.android.tools.r8.ir.optimize.string.StringOptimizer$StringOptimizerEscapeAnalysisConfiguration getInstance():586:586 -> a
     2:22:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):595:615 -> a
-com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.e5:
+com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization -> com.android.tools.r8.internal.f5:
     com.android.tools.r8.ir.conversion.IRConverter converter -> d
     com.android.tools.r8.ir.optimize.info.OptimizationFeedbackSimple feedback -> a
     com.android.tools.r8.graph.AppView appView -> c
@@ -46817,7 +47172,7 @@
     26:27:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.resolveOnSuperClass(com.android.tools.r8.graph.ProgramMethod):152:153 -> a
     26:27:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):102 -> a
     26:27:void execute():81 -> a
-    28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    28:28:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     28:28:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.resolveOnSuperClass(com.android.tools.r8.graph.ProgramMethod):153 -> a
     28:28:void com.android.tools.r8.ir.optimize.typechecks.CheckCastAndInstanceOfMethodSpecialization.processCandidateForInstanceOfOptimization(com.android.tools.r8.graph.ProgramMethod):102 -> a
     28:28:void execute():81 -> a
@@ -46881,7 +47236,7 @@
     127:127:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
     128:151:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):473:496 -> a
     128:151:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
-    152:152:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
+    152:152:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
     152:152:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):499 -> a
     152:152:void computeDebugInfo(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.List,com.android.tools.r8.ir.regalloc.RegisterAllocator,java.util.Map):344 -> a
     153:155:void setLocalsAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator,java.util.List,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap,com.android.tools.r8.ir.regalloc.RegisterAllocator):499:501 -> a
@@ -47176,16 +47531,16 @@
     1463:1463:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2336 -> a
     1464:1471:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2337:2344 -> a
     1472:1507:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2452:2487 -> a
-    1508:1508:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    1508:1508:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     1508:1508:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2659 -> a
     1508:1508:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2487 -> a
     1509:1515:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2487:2493 -> a
     1516:1567:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2526:2577 -> a
     1568:1574:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2574:2580 -> a
-    1575:1575:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    1575:1575:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     1575:1575:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2580 -> a
     1576:1583:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2580:2587 -> a
-    1584:1584:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    1584:1584:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     1584:1584:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2659 -> a
     1584:1584:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2587 -> a
     1585:1622:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2587:2624 -> a
@@ -47260,14 +47615,14 @@
     101:106:void computeLiveRanges():2498:2503 -> b
     101:106:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     101:106:void allocateRegisters():215 -> b
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1556:1556 -> b
+    107:107:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisTypeVerifierBug():1574:1574 -> b
     107:107:void computeLiveRanges():2503 -> b
     107:107:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     107:107:void allocateRegisters():215 -> b
     108:108:void computeLiveRanges():2503:2503 -> b
     108:108:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     108:108:void allocateRegisters():215 -> b
-    109:109:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1565:1565 -> b
+    109:109:boolean com.android.tools.r8.utils.InternalOptions.canHaveThisJitCodeDebuggingBug():1583:1583 -> b
     109:109:void computeLiveRanges():2503 -> b
     109:109:com.android.tools.r8.com.google.common.collect.ImmutableList computeLivenessInformation():638 -> b
     109:109:void allocateRegisters():215 -> b
@@ -47301,16 +47656,16 @@
     1:3:int registersUsed():596:598 -> c
     4:9:int unadjustedRealRegisterFromAllocated(int):807:812 -> c
     10:10:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1507:1507 -> c
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1571:1571 -> c
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.canHaveOverlappingLongRegisterBug():1589:1589 -> c
     11:11:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1507 -> c
     12:32:boolean needsLongResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1510:1530 -> c
     33:45:boolean isLongResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1543:1555 -> c
     46:46:boolean registersAreFree(int,boolean):3118:3118 -> c
     1:1:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1604:1604 -> d
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1622:1622 -> d
     2:2:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     3:3:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1778:1778 -> d
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1796:1796 -> d
     4:4:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     5:18:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1462 -> d
     19:19:boolean com.android.tools.r8.ir.code.Instruction.isCmp():0:0 -> d
@@ -47321,12 +47676,12 @@
     25:25:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477:1477 -> d
     26:26:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     26:26:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1604:1604 -> d
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.canHaveCmpLongBug():1622:1622 -> d
     27:27:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     27:27:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     28:28:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446:1446 -> d
     28:28:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
-    29:29:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1778:1778 -> d
+    29:29:boolean com.android.tools.r8.utils.InternalOptions.canHaveLongToIntBug():1796:1796 -> d
     29:29:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1446 -> d
     29:29:boolean isSingleResultOverlappingLongOperands(com.android.tools.r8.ir.regalloc.LiveIntervals,int):1477 -> d
     30:43:boolean needsSingleResultOverlappingLongOperandsWorkaround(com.android.tools.r8.ir.regalloc.LiveIntervals):1449:1462 -> d
@@ -47589,7 +47944,7 @@
     1:1:java.util.TreeSet getUses():258:258 -> z
     1:1:int numberOfUsesWithConstraint():540 -> z
     2:3:int numberOfUsesWithConstraint():540:541 -> z
-com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.Mm:
+com.android.tools.r8.ir.regalloc.LiveIntervalsUse -> com.android.tools.r8.internal.Zm:
     int limit -> b
     int position -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -47601,7 +47956,7 @@
     2:5:int compareTo(java.lang.Object):8 -> compareTo
     1:5:boolean equals(java.lang.Object):32:36 -> equals
     1:1:int hashCode():27:27 -> hashCode
-com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.Om:
+com.android.tools.r8.ir.regalloc.LiveRange -> com.android.tools.r8.internal.bn:
     com.android.tools.r8.ir.regalloc.LiveRange INFINITE -> a
     int start -> b
     int end -> c
@@ -47611,7 +47966,7 @@
     2:5:int com.android.tools.r8.ir.regalloc.LiveRange.compareTo(com.android.tools.r8.ir.regalloc.LiveRange):20:23 -> compareTo
     2:5:int compareTo(java.lang.Object):6 -> compareTo
     1:1:java.lang.String toString():28:28 -> toString
-com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.zw:
+com.android.tools.r8.ir.regalloc.RegisterAllocator -> com.android.tools.r8.internal.Sw:
     void addNewBlockToShareIdenticalSuffix(com.android.tools.r8.ir.code.BasicBlock,int,java.util.List) -> a
     int getRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> a
     boolean hasEqualTypesAtEntry(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> a
@@ -47620,7 +47975,7 @@
     int getArgumentOrAllocateRegisterForValue(com.android.tools.r8.ir.code.Value,int) -> b
     void mergeBlocks(com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.BasicBlock) -> b
     int registersUsed() -> c
-com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.Aw:
+com.android.tools.r8.ir.regalloc.RegisterMove -> com.android.tools.r8.internal.Tw:
     com.android.tools.r8.ir.analysis.type.TypeElement type -> b
     com.android.tools.r8.ir.code.Instruction definition -> e
     int src -> d
@@ -47636,7 +47991,7 @@
     2:28:int compareTo(java.lang.Object):13 -> compareTo
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():63:63 -> hashCode
-com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.Bw:
+com.android.tools.r8.ir.regalloc.RegisterMoveScheduler -> com.android.tools.r8.internal.Uw:
     java.util.Map valueMap -> c
     int tempRegister -> g
     int usedTempRegisters -> d
@@ -47735,7 +48090,7 @@
     24:24:boolean com.android.tools.r8.ir.code.Instruction.isMoveException():0:0 -> a
     24:24:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):287 -> a
     25:31:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):288:294 -> a
-    32:32:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1557:1557 -> a
+    32:32:com.android.tools.r8.ir.code.Position com.android.tools.r8.ir.code.BasicBlock.getPosition():1559:1559 -> a
     32:32:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):294 -> a
     33:44:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):299:310 -> a
     45:48:void pruneParallelMoveSets(java.util.Set,java.util.Set,java.util.Set):269:272 -> a
@@ -47756,7 +48111,7 @@
     61:65:void scheduleMovesBeforeInstruction(int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.InstructionListIterator):316:320 -> a
     66:74:void removeArgumentRestores(java.util.Set):332:340 -> a
     75:99:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):347:371 -> a
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1540:1540 -> a
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.canHaveBoundsCheckEliminationBug():1558:1558 -> a
     100:100:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371 -> a
     101:106:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):371:376 -> a
     107:111:void scheduleMoves(int,java.util.Set,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.Position):375:379 -> a
@@ -47800,25 +48155,25 @@
     java.util.function.Consumer getRegistryCallback() -> z
 com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider -> com.android.tools.r8.internal.N0$a:
     com.android.tools.r8.ir.conversion.SourceCode get(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.f8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider -> com.android.tools.r8.internal.k8:
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):44:44 -> <init>
     1:1:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):48:48 -> a
     2:2:boolean com.android.tools.r8.ir.desugar.PrefixRewritingMapper.hasRewrittenType(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):34:34 -> a
     2:2:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):48 -> a
     3:6:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter,com.android.tools.r8.graph.DexMethod):51:54 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.a8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterConstructorCfCodeProvider -> com.android.tools.r8.internal.f8:
     com.android.tools.r8.graph.DexField wrapperField -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexField):291:292 -> <init>
     1:9:com.android.tools.r8.graph.CfCode generateCfCode():297:305 -> a
     10:10:com.android.tools.r8.graph.CfCode generateCfCode():303:303 -> a
     11:23:com.android.tools.r8.graph.CfCode generateCfCode():300:312 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.b8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterThrowRuntimeExceptionCfCodeProvider -> com.android.tools.r8.internal.g8:
     com.android.tools.r8.graph.DexString message -> c
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):323:324 -> <init>
     1:11:com.android.tools.r8.graph.CfCode generateCfCode():329:339 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():337:337 -> a
     13:22:com.android.tools.r8.graph.CfCode generateCfCode():334:343 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.c8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterVivifiedWrapperCfCodeProvider -> com.android.tools.r8.internal.h8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -47839,7 +48194,7 @@
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():133 -> a
     45:45:com.android.tools.r8.graph.CfCode generateCfCode():132:132 -> a
     46:58:com.android.tools.r8.graph.CfCode generateCfCode():129:141 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.d8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperCfCodeProvider -> com.android.tools.r8.internal.i8:
     com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter converter -> e
     boolean itfCall -> f
     com.android.tools.r8.graph.DexField wrapperField -> c
@@ -47857,7 +48212,7 @@
     44:44:com.android.tools.r8.graph.DexType com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider.vivifiedTypeFor(com.android.tools.r8.graph.DexType):59:59 -> a
     44:44:com.android.tools.r8.graph.CfCode generateCfCode():211 -> a
     45:50:com.android.tools.r8.graph.CfCode generateCfCode():213:218 -> a
-com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.e8:
+com.android.tools.r8.ir.synthetic.DesugaredLibraryAPIConversionCfCodeProvider$APIConverterWrapperConversionCfCodeProvider -> com.android.tools.r8.internal.j8:
     com.android.tools.r8.graph.DexField wrapperField -> f
     com.android.tools.r8.graph.DexField reverseWrapperField -> e
     com.android.tools.r8.graph.DexType argType -> d
@@ -47870,7 +48225,7 @@
     4:40:com.android.tools.r8.graph.CfCode generateCfCode():242:278 -> a
     41:41:com.android.tools.r8.graph.CfCode generateCfCode():276:276 -> a
     42:51:com.android.tools.r8.graph.CfCode generateCfCode():273:282 -> a
-com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.m9:
+com.android.tools.r8.ir.synthetic.EmulateInterfaceSyntheticCfCodeProvider -> com.android.tools.r8.internal.v9:
     java.util.List extraDispatchCases -> f
     com.android.tools.r8.graph.DexType interfaceType -> c
     com.android.tools.r8.graph.DexMethod libraryMethod -> e
@@ -47882,7 +48237,7 @@
     6:48:com.android.tools.r8.graph.CfCode generateCfCode():62:104 -> a
     1:4:void addReturn(java.util.List):115:118 -> b
     1:2:void loadExtraParameters(java.util.List):109:110 -> c
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.N9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider -> com.android.tools.r8.internal.W9:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():42:42 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):45:45 -> <init>
@@ -47891,7 +48246,7 @@
     4:4:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):55 -> a
     5:8:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):56:56 -> a
     12:12:void addCfInstructionsForAbstractValue(java.util.List,com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.graph.DexType):60:60 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.K9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingInstanceFieldCfCodeProvider -> com.android.tools.r8.internal.T9:
     com.android.tools.r8.ir.analysis.value.AbstractValue nullValue -> g
     com.android.tools.r8.graph.DexType returnType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> f
@@ -47902,7 +48257,7 @@
     3:3:com.android.tools.r8.graph.CfCode generateCfCode():98 -> a
     4:35:com.android.tools.r8.graph.CfCode generateCfCode():98:129 -> a
     36:45:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):106:115 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.L9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValueOfCfCodeProvider -> com.android.tools.r8.internal.U9:
     com.android.tools.r8.graph.DexType enumType -> d
     com.android.tools.r8.ir.optimize.enums.EnumInstanceFieldData$EnumInstanceFieldMappingData fieldDataMap -> f
     com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap map -> e
@@ -47914,7 +48269,7 @@
     47:47:com.android.tools.r8.graph.CfCode generateCfCode():205:205 -> a
     48:62:com.android.tools.r8.graph.CfCode generateCfCode():201:215 -> a
     63:73:void lambda$generateCfCode$0(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap,com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo):185:195 -> a
-com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.M9:
+com.android.tools.r8.ir.synthetic.EnumUnboxingCfCodeProvider$EnumUnboxingValuesCfCodeProvider -> com.android.tools.r8.internal.V9:
     com.android.tools.r8.graph.DexField utilityField -> e
     int numEnumInstances -> f
     com.android.tools.r8.graph.DexMethod initializationMethod -> g
@@ -47926,7 +48281,7 @@
     11:11:com.android.tools.r8.graph.CfCode generateCfCode():258 -> a
     12:12:com.android.tools.r8.graph.CfCode generateCfCode():258:258 -> a
     13:18:com.android.tools.r8.graph.CfCode generateCfCode():256:261 -> a
-com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.ca:
+com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode -> com.android.tools.r8.internal.la:
     com.android.tools.r8.graph.DexType exceptionType -> m
     1:2:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Position,com.android.tools.r8.graph.DexType):25:26 -> <init>
     1:1:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):31:31 -> f
@@ -47935,7 +48290,7 @@
     13:20:void com.android.tools.r8.ir.synthetic.ExceptionThrowingSourceCode.build(com.android.tools.r8.ir.conversion.IRBuilder,com.android.tools.r8.graph.DexType):40:47 -> f
     13:20:void lambda$prepareInstructions$0(com.android.tools.r8.ir.conversion.IRBuilder):31 -> f
     1:1:void prepareInstructions():31:31 -> i
-com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.internal.ra:
+com.android.tools.r8.ir.synthetic.FieldAccessorSourceCode -> com.android.tools.r8.internal.Aa:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess fieldWithAccess -> n
     1:1:void <clinit>():15:15 -> <clinit>
@@ -47956,7 +48311,7 @@
     21:21:boolean com.android.tools.r8.ir.desugar.NestBasedAccessDesugaring$DexFieldWithAccess.isStaticPut():504:504 -> i
     21:21:void prepareInstructions():49 -> i
     22:25:void prepareInstructions():49:52 -> i
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.hb:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder -> com.android.tools.r8.internal.qb:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     java.lang.Boolean isInterface -> g
     boolean isConstructorDelegate -> i
@@ -47975,7 +48330,7 @@
     4:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setDirectTarget(com.android.tools.r8.graph.DexMethod,boolean):83:85 -> a
     7:7:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setCastArguments(com.android.tools.r8.graph.AppInfoWithClassHierarchy):95:95 -> a
     8:8:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setConstructorTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):100:100 -> a
-    9:9:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):261:261 -> a
+    9:9:boolean com.android.tools.r8.graph.DexMethod.isInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):265:265 -> a
     9:9:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setConstructorTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):100 -> a
     10:14:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setConstructorTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexItemFactory):100:104 -> a
     15:15:com.android.tools.r8.graph.CfCode build():109:109 -> a
@@ -48063,7 +48418,7 @@
     3:5:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setStaticTarget(com.android.tools.r8.graph.DexMethod,boolean):69:71 -> b
     6:6:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setCastResult():90:90 -> b
     1:3:com.android.tools.r8.ir.synthetic.ForwardMethodBuilder setVirtualTarget(com.android.tools.r8.graph.DexMethod,boolean):76:78 -> c
-com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.gb:
+com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType -> com.android.tools.r8.internal.pb:
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType VIRTUAL -> b
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType STATIC -> a
     com.android.tools.r8.ir.synthetic.ForwardMethodBuilder$InvokeType SPECIAL -> c
@@ -48071,7 +48426,7 @@
     1:3:void <clinit>():34:36 -> <clinit>
     4:4:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,int):33:33 -> <init>
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.ib:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode -> com.android.tools.r8.internal.rb:
     boolean $assertionsDisabled -> m
     int $r8$clinit -> n
     com.android.tools.r8.graph.DexType targetReceiver -> o
@@ -48088,7 +48443,7 @@
     1:1:void lambda$prepareInstructions$3(int,com.android.tools.r8.ir.conversion.IRBuilder):214:214 -> d
     1:36:void prepareInstructions():179:214 -> i
     1:27:boolean checkSignatures():146:172 -> j
-com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.ib$a:
+com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder -> com.android.tools.r8.internal.rb$a:
     com.android.tools.r8.ir.code.Invoke$Type invokeType -> f
     com.android.tools.r8.graph.DexType targetReceiver -> d
     com.android.tools.r8.graph.DexMethod target -> e
@@ -48106,7 +48461,7 @@
     6:6:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode build(com.android.tools.r8.ir.code.Position):90:90 -> a
     1:1:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTargetReceiver(com.android.tools.r8.graph.DexType):60:60 -> b
     2:2:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder setTarget(com.android.tools.r8.graph.DexMethod):65:65 -> b
-com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.Sz:
+com.android.tools.r8.ir.synthetic.SynthesizedCode -> com.android.tools.r8.internal.lA:
     java.util.function.Consumer registryCallback -> d
     com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider sourceCodeProvider -> c
     1:1:void <init>(com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider):17:17 -> <init>
@@ -48114,7 +48469,7 @@
     1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():27:27 -> A
     1:1:void registerReachableDefinitionsDefault(com.android.tools.r8.graph.UseRegistry):36:36 -> a
     1:1:java.util.function.Consumer getRegistryCallback():32:32 -> z
-com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.Yz:
+com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider -> com.android.tools.r8.internal.rA:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.graph.DexType holder -> b
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexType):20:22 -> <init>
@@ -48122,7 +48477,7 @@
     2:2:java.util.List com.android.tools.r8.ir.synthetic.SyntheticCfCodeProvider.defaultTryCatchs():46:46 -> a
     2:2:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):33 -> a
     3:3:com.android.tools.r8.graph.CfCode standardCfCodeFromInstructions(java.util.List):34:34 -> a
-com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.jA:
+com.android.tools.r8.ir.synthetic.SyntheticSourceCode -> com.android.tools.r8.internal.BA:
     int[] paramRegisters -> i
     com.android.tools.r8.ir.code.Position position -> l
     int receiverRegister -> h
@@ -48175,18 +48530,18 @@
     1:3:int getParamRegister(int):92:94 -> h
     4:4:int nextInstructionIndex():109:109 -> h
     void prepareInstructions() -> i
-com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.nb:
-com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Ob:
+com.android.tools.r8.it.unimi.dsi.fastutil.Function -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.it.unimi.dsi.fastutil.Hash$Strategy -> com.android.tools.r8.internal.Xb:
     boolean equals(java.lang.Object,java.lang.Object) -> a
     int hashCode(java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.Yb:
+com.android.tools.r8.it.unimi.dsi.fastutil.HashCommon -> com.android.tools.r8.internal.hc:
     int long2int(long) -> a
     int mix(int) -> a
     1:2:int arraySize(int,float):228:229 -> a
     long mix(long) -> b
     1:1:int maxFill(int,float):205:205 -> b
     long nextPowerOfTwo(long) -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.zy:
+com.android.tools.r8.it.unimi.dsi.fastutil.Stack -> com.android.tools.r8.internal.Sy:
 com.android.tools.r8.it.unimi.dsi.fastutil.booleans.AbstractBooleanCollection -> com.android.tools.r8.internal.h:
     1:1:void <init>():37:37 -> <init>
     1:1:boolean add(boolean):68:68 -> a
@@ -48304,6 +48659,7 @@
     1:2:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):0 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):41 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntFunction.get(java.lang.Object):0 -> get
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap.int2IntEntrySet() -> h
     1:1:int hashCode():324:324 -> hashCode
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2IntMap.entrySet():311:311 -> hashCode
     2:2:int hashCode():325 -> hashCode
@@ -48360,8 +48716,8 @@
     boolean containsKey(int) -> a
     1:1:java.util.Set entrySet():42:42 -> entrySet
     1:4:boolean equals(java.lang.Object):296:299 -> equals
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> h
     1:4:int hashCode():286:289 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> i
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap.keySet():37:37 -> keySet
     1:13:void putAll(java.util.Map):70:82 -> putAll
     14:16:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceFunction.put(java.lang.Integer,java.lang.Object):135:137 -> putAll
@@ -48392,11 +48748,11 @@
     1:1:java.lang.Integer firstKey():85:85 -> firstKey
     2:2:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.firstKey():85:85 -> firstKey
     2:2:java.lang.Object firstKey():30 -> firstKey
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():293:293 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):30:30 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.headMap(java.lang.Integer):46:46 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):30 -> headMap
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap.entrySet():293:293 -> i
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():30 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.keySet():1435:1435 -> keySet
     2:2:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.keySet():1435:1435 -> keySet
     1:1:java.lang.Integer lastKey():98:98 -> lastKey
@@ -48631,7 +48987,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractInt2ReferenceSortedMap$KeySet.tailSet(int):160:160 -> tailSet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.AbstractIntSortedSet.tailSet(java.lang.Integer):68 -> tailSet
     3:3:java.util.SortedSet tailSet(java.lang.Object):22 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.pe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap -> com.android.tools.r8.internal.De:
     int[] key -> b
     int[] value -> c
     int size -> d
@@ -48643,8 +48999,6 @@
     1:1:int access$010(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> b
     2:21:int put(int,int):279:298 -> b
     1:1:int[] access$100(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):37:37 -> c
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.int2IntEntrySet():230:230 -> c
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> c
     1:1:void clear():256:256 -> clear
     1:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.clone():339:344 -> clone
     1:6:java.lang.Object clone():37 -> clone
@@ -48655,6 +49009,8 @@
     1:7:int remove(int):304:310 -> f
     1:3:int findKey(int):234:236 -> g
     1:4:int get(int):243:246 -> get
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.int2IntEntrySet():230:230 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():37 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321:321 -> i
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> i
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values():321 -> i
@@ -48668,8 +49024,8 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections.unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap.values():321 -> values
     2:2:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.me:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.oe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1 -> com.android.tools.r8.internal.Ae:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Ce:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$1):133:133 -> <init>
@@ -48679,7 +49035,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):212:223 -> remove
     1:1:int size():195:195 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.ne:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Be:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -48688,15 +49044,13 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:6:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.qe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntFunction -> com.android.tools.r8.internal.Ee:
     boolean containsKey(int) -> a
     int put(int,int) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap -> com.android.tools.r8.internal.te:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet() -> c
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.re:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$Entry -> com.android.tools.r8.internal.Fe:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.se:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Ce:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet -> com.android.tools.r8.internal.Ge:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap -> com.android.tools.r8.internal.Pe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet entries -> i
     int[] key -> b
     int[] value -> c
@@ -48718,8 +49072,6 @@
     1:16:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.insert(int,int):248:263 -> b
     1:16:int put(int,int):270 -> b
     17:19:int put(int,int):271:273 -> b
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.int2IntEntrySet():773:774 -> c
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> c
     1:4:void clear():420:423 -> clear
     1:10:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.clone():1017:1026 -> clone
     1:10:java.lang.Object clone():50 -> clone
@@ -48738,6 +49090,8 @@
     9:9:int removeEntry(int):223:223 -> h
     10:15:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.shiftKeys(int):341:346 -> h
     10:15:int removeEntry(int):222 -> h
+    16:17:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.int2IntEntrySet():773:774 -> h
+    16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2IntEntrySet():50 -> h
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.realSize():206:206 -> hashCode
     1:1:int hashCode():1043 -> hashCode
     2:10:int hashCode():1044:1052 -> hashCode
@@ -48757,14 +49111,14 @@
     1:1:int size():428:428 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap.values():866:887 -> values
     1:22:java.util.Collection values():50 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.ue:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1 -> com.android.tools.r8.internal.He:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):866:866 -> <init>
     1:1:boolean contains(int):879:879 -> b
     1:1:void clear():884:884 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():869:869 -> iterator
     1:1:int size():874:874 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.ve:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ie:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):664:664 -> <init>
@@ -48772,13 +49126,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$EntryIterator.next():669:669 -> next
     1:1:java.lang.Object next():664 -> next
     1:2:void remove():674:675 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.we:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Je:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):787:788 -> <init>
     1:1:int nextInt():793:793 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeyIterator.next():799:799 -> next
     1:1:java.lang.Object next():786 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.xe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Ke:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):803:803 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):803:803 -> <init>
@@ -48787,7 +49141,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():806:806 -> iterator
     1:3:boolean remove(int):821:823 -> remove
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.ye:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Le:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,int):472:473 -> <init>
@@ -48808,7 +49162,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):529:529 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):467 -> setValue
     1:1:java.lang.String toString():547:547 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.ze:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Me:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):689:689 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$1):689:689 -> <init>
@@ -48817,7 +49171,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():691:691 -> iterator
     1:30:boolean remove(java.lang.Object):724:753 -> remove
     1:1:int size():762:762 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ae:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ne:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> f
     int last -> b
@@ -48835,13 +49189,13 @@
     13:22:void remove():644 -> remove
     23:24:void remove():647:648 -> remove
     25:25:void remove():641:641 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Be:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Oe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap):848:849 -> <init>
     1:1:int nextInt():854:854 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap$ValueIterator.next():860:860 -> next
     1:1:java.lang.Object next():847 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Ie:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap -> com.android.tools.r8.internal.Ve:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry -> e
     boolean modified -> i
@@ -48941,7 +49295,8 @@
     1:1:int compare(int,int):232:232 -> c
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(int,int):104:104 -> c
     2:2:int compare(int,int):232 -> c
-    3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> c
+    3:5:int firstIntKey():1001:1001 -> c
+    6:6:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1411:1411 -> c
     1:6:void clear():701:706 -> clear
     1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap.clone():1948:1954 -> clone
     1:7:java.lang.Object clone():41 -> clone
@@ -48973,13 +49328,12 @@
     4:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator.next():1351:1351 -> containsValue
     4:4:boolean containsValue(java.lang.Object):693 -> containsValue
     1:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry findKey(int):245:248 -> d
-    5:7:int firstIntKey():1001:1001 -> d
     1:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry locateKey(int):262:266 -> e
+    1:3:int lastIntKey():1007:1007 -> g
     1:2:java.lang.Object get(int):995:996 -> get
-    1:3:int lastIntKey():1007:1007 -> h
+    1:1:void allocatePaths():278:278 -> i
     1:1:boolean isEmpty():990:990 -> isEmpty
-    1:1:void allocatePaths():278:278 -> j
-    1:3:void setActualComparator():101:101 -> k
+    1:3:void setActualComparator():101:101 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1334:1335 -> keySet
     1:41:java.lang.Object remove(int):484:524 -> remove
     42:42:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry.balance():872:872 -> remove
@@ -49030,14 +49384,14 @@
     209:212:java.lang.Object remove(int):494:497 -> remove
     1:1:int size():985:985 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1384:1401 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.De:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1 -> com.android.tools.r8.internal.Qe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):102:102 -> <init>
     1:1:int compare(int,int):104:104 -> a
     1:1:int compare(java.lang.Object,java.lang.Object):102:102 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1.compare(java.lang.Integer,java.lang.Integer):108:108 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):102 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.Fe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 -> com.android.tools.r8.internal.Se:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1161:1162 -> <init>
@@ -49060,20 +49414,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1161:1161 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1236:1236 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1161 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.Ee:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1 -> com.android.tools.r8.internal.Re:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2):1162:1162 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1162:1162 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1164:1164 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1162 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.Ge:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$3 -> com.android.tools.r8.internal.Te:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1384:1384 -> <init>
     1:1:void clear():1398:1398 -> clear
     1:1:boolean contains(java.lang.Object):1390:1390 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1386:1386 -> iterator
     1:1:int size():1394:1394 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.He:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry -> com.android.tools.r8.internal.Ue:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry left -> c
     int info -> e
@@ -49100,7 +49454,7 @@
     1:1:boolean succ():795:795 -> j
     1:2:java.lang.Object setValue(java.lang.Object):923:924 -> setValue
     1:1:java.lang.String toString():958:958 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Ie$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator -> com.android.tools.r8.internal.Ve$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1131:1131 -> <init>
     1:1:void add(java.lang.Object):1130:1130 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1155:1155 -> add
@@ -49112,7 +49466,7 @@
     1:1:void set(java.lang.Object):1130:1130 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1150:1150 -> set
     2:2:void set(java.lang.Object):1130 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.Ie$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator -> com.android.tools.r8.internal.Ve$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1253:1253 -> <init>
     1:1:void add(java.lang.Object):1252:1252 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.add(java.lang.Integer):1301:1301 -> add
@@ -49126,12 +49480,12 @@
     1:1:void set(java.lang.Object):1252:1252 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeyIterator.set(java.lang.Integer):1295:1295 -> set
     2:2:void set(java.lang.Object):1252 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Ie$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$KeySet -> com.android.tools.r8.internal.Ve$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1308:1308 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1308:1308 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1311:1311 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Ie$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap -> com.android.tools.r8.internal.Ve$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
@@ -49149,17 +49503,18 @@
     1:81:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1497:1577 -> b
     82:83:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1692:1693 -> b
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1686:1687 -> c
+    3:5:int firstIntKey():1753:1755 -> c
+    6:6:int firstIntKey():1754:1754 -> c
     1:4:void clear():1477:1480 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1681:1681 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap.comparator():1681:1681 -> comparator
     2:2:java.util.Comparator comparator():1435 -> comparator
     1:4:boolean containsValue(java.lang.Object):1629:1632 -> containsValue
     1:1:boolean in(int):1492:1492 -> d
-    2:4:int firstIntKey():1753:1755 -> d
-    5:5:int firstIntKey():1754:1754 -> d
+    1:3:int lastIntKey():1760:1762 -> g
+    4:4:int lastIntKey():1761:1761 -> g
     1:1:java.lang.Object get(int):1643:1643 -> get
-    1:3:int lastIntKey():1760:1762 -> h
-    4:4:int lastIntKey():1761:1761 -> h
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1724 -> i
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1777 -> isEmpty
     1:1:boolean isEmpty():1676 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1043:1043 -> isEmpty
@@ -49167,13 +49522,12 @@
     2:2:boolean isEmpty():1676 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1778:1778 -> isEmpty
     3:3:boolean isEmpty():1676 -> isEmpty
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry firstEntry():1712:1724 -> j
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1735:1747 -> k
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry lastEntry():1735:1747 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1592:1593 -> keySet
     1:4:java.lang.Object remove(int):1657:1660 -> remove
     1:5:int size():1665:1669 -> size
     1:21:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1598:1618 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.Je:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1 -> com.android.tools.r8.internal.We:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1497:1497 -> <init>
     1:1:void clear():1549:1549 -> clear
@@ -49203,19 +49557,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1497:1497 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1574:1574 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1497 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Ke:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$2 -> com.android.tools.r8.internal.Xe:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1598:1598 -> <init>
     1:1:void clear():1615:1615 -> clear
     1:1:boolean contains(java.lang.Object):1605:1605 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1600:1600 -> iterator
     1:1:int size():1610:1610 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ie$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Ve$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1580:1580 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1580:1580 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1582:1582 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ie$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Ve$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1808:1808 -> <init>
     1:1:void add(java.lang.Object):1807:1807 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1832:1832 -> add
@@ -49227,12 +49581,12 @@
     1:1:void set(java.lang.Object):1807:1807 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1827:1827 -> set
     2:2:void set(java.lang.Object):1807 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Ie$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Ve$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1777:1778 -> <init>
     1:2:void updateNext():1802:1803 -> n
     1:2:void updatePrevious():1797:1798 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ie$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Ve$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1848:1848 -> <init>
     1:1:void add(java.lang.Object):1846:1846 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1896:1896 -> add
@@ -49246,14 +49600,14 @@
     1:1:void set(java.lang.Object):1846:1846 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1890:1890 -> set
     2:2:void set(java.lang.Object):1846 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Ie$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Ve$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap):1910:1910 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1910:1910 -> <init>
     1:1:void add(java.lang.Object):1928:1928 -> add
     1:1:java.lang.Object next():1913:1913 -> next
     1:1:java.lang.Object previous():1918:1918 -> previous
     1:1:void set(java.lang.Object):1923:1923 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Ie$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$TreeIterator -> com.android.tools.r8.internal.Ve$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$Entry curr -> c
@@ -49270,14 +49624,14 @@
     1:1:void updatePrevious():1076:1076 -> o
     1:1:int previousIndex():1092:1092 -> previousIndex
     1:12:void remove():1096:1096 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Ie$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$ValueIterator -> com.android.tools.r8.internal.Ve$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap):1348:1348 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceAVLTreeMap$1):1348:1348 -> <init>
     1:1:void add(java.lang.Object):1366:1366 -> add
     1:1:java.lang.Object next():1351:1351 -> next
     1:1:java.lang.Object previous():1356:1356 -> previous
     1:1:void set(java.lang.Object):1361:1361 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.Ne:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap -> com.android.tools.r8.internal.af:
     java.lang.Object[] value -> c
     int[] key -> b
     int size -> d
@@ -49305,8 +49659,8 @@
     1:8:java.lang.Object remove(int):308:315 -> remove
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():326:326 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.Le:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.Ne$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1 -> com.android.tools.r8.internal.Ye:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet -> com.android.tools.r8.internal.af$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$1):133:133 -> <init>
@@ -49316,7 +49670,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Me:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Ze:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -49325,18 +49679,18 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.Oe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunction -> com.android.tools.r8.internal.bf:
     boolean containsKey(int) -> a
     java.lang.Object put(int,java.lang.Object) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.Pe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap -> com.android.tools.r8.internal.cf:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet int2ReferenceEntrySet() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.Pe$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry -> com.android.tools.r8.internal.cf$a:
     int getIntKey() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Qe:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.Se:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.df:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps -> com.android.tools.r8.internal.ff:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap EMPTY_MAP -> a
     1:1:void <clinit>():124:124 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.Re:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap -> com.android.tools.r8.internal.ef:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.<init>():41:41 -> <init>
     1:1:void <init>():46 -> <init>
     boolean com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.containsKey(int) -> a
@@ -49346,7 +49700,7 @@
     1:1:java.util.Set entrySet():43:43 -> entrySet
     1:2:boolean equals(java.lang.Object):110:111 -> equals
     java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceFunctions$EmptyFunction.get(int) -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():75:75 -> h
     1:1:java.util.Set keySet():43:43 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():80:80 -> keySet
     1:1:void putAll(java.util.Map):56:56 -> putAll
@@ -49354,7 +49708,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():86:86 -> values
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMaps$EmptyMap.values():86:86 -> values
     2:2:java.util.Collection values():43 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.Ue:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap -> com.android.tools.r8.internal.hf:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$FastEntrySet entries -> i
     java.lang.Object[] value -> c
@@ -49398,8 +49752,8 @@
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
     2:10:int hashCode():972:980 -> hashCode
+    1:5:java.lang.Object removeNullEntry():228:232 -> i
     1:1:boolean isEmpty():391:391 -> isEmpty
-    1:5:java.lang.Object removeNullEntry():228:232 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():768:769 -> keySet
     1:1:void putAll(java.util.Map):238:238 -> putAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap.ensureCapacity(int):209:210 -> putAll
@@ -49413,14 +49767,14 @@
     1:12:java.lang.Object remove(int):309:320 -> remove
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():794:815 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.Te:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.gf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Ue$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.hf$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):600:600 -> <init>
@@ -49428,13 +49782,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Ue$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.hf$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):721:722 -> <init>
     1:1:int nextInt():727:727 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.Ue$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.hf$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -49443,7 +49797,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():740:740 -> iterator
     1:3:boolean remove(int):755:757 -> remove
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.Ue$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.hf$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -49455,7 +49809,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Ue$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.hf$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -49464,7 +49818,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.Ue$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.hf$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -49482,11 +49836,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Ue$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.hf$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.af:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap -> com.android.tools.r8.internal.nf:
     boolean[] dirPath -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry tree -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
@@ -49544,7 +49898,8 @@
     1:79:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet():1127:1205 -> b
     80:80:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):1384:1384 -> b
     1:1:int compare(int,int):234:234 -> c
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1379:1379 -> c
+    2:4:int firstIntKey():967:967 -> c
+    5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1379:1379 -> c
     1:6:void clear():679:684 -> clear
     1:7:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.clone():1913:1919 -> clone
     1:7:java.lang.Object clone():43 -> clone
@@ -49576,15 +49931,14 @@
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> d
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry findKey(int):249 -> d
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry findKey(int):250:250 -> d
-    6:8:int firstIntKey():967:967 -> d
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):264:266 -> e
     4:4:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> e
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):266 -> e
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry locateKey(int):268:268 -> e
+    1:3:int lastIntKey():973:973 -> g
     1:2:java.lang.Object get(int):961:962 -> get
-    1:3:int lastIntKey():973:973 -> h
+    1:2:void allocatePaths():282:283 -> i
     1:1:boolean isEmpty():956:956 -> isEmpty
-    1:2:void allocatePaths():282:283 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1298:1299 -> keySet
     1:8:java.lang.Object remove(int):449:456 -> remove
     9:9:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):234:234 -> remove
@@ -49608,8 +49962,8 @@
     256:272:java.lang.Object remove(int):457:473 -> remove
     1:1:int size():951:951 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1348:1369 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Ve:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Xe:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.if:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.kf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1127:1128 -> <init>
@@ -49632,20 +49986,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1127:1127 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1202:1202 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1127 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.We:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1 -> com.android.tools.r8.internal.jf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2):1128:1128 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1128:1128 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$2$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1130:1130 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1128 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.Ye:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$3 -> com.android.tools.r8.internal.lf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1348:1348 -> <init>
     1:1:void clear():1366:1366 -> clear
     1:1:boolean contains(java.lang.Object):1356:1356 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1351:1351 -> iterator
     1:1:int size():1361:1361 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.Ze:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.mf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -49672,7 +50026,7 @@
     1:1:boolean succ():770:770 -> i
     1:2:java.lang.Object setValue(java.lang.Object):889:890 -> setValue
     1:1:java.lang.String toString():924:924 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.af$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.nf$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1097:1097 -> <init>
     1:1:void add(java.lang.Object):1096:1096 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1121:1121 -> add
@@ -49684,7 +50038,7 @@
     1:1:void set(java.lang.Object):1096:1096 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1116:1116 -> set
     2:2:void set(java.lang.Object):1096 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.af$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.nf$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1219:1219 -> <init>
     1:1:void add(java.lang.Object):1218:1218 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.add(java.lang.Integer):1267:1267 -> add
@@ -49698,12 +50052,12 @@
     1:1:void set(java.lang.Object):1218:1218 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeyIterator.set(java.lang.Integer):1261:1261 -> set
     2:2:void set(java.lang.Object):1218 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.af$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.nf$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1274:1274 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1274:1274 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1276:1276 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.af$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.nf$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entries -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap this$0 -> i
@@ -49733,6 +50087,8 @@
     3:237:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> c
     3:237:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652 -> c
     238:238:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):1652:1652 -> c
+    239:241:int firstIntKey():1718:1720 -> c
+    242:242:int firstIntKey():1719:1719 -> c
     1:4:void clear():1445:1448 -> clear
     1:1:java.util.Comparator comparator():1403:1403 -> comparator
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator comparator():1646:1646 -> comparator
@@ -49743,11 +50099,15 @@
     237:237:boolean in(int):1460:1460 -> d
     238:472:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> d
     238:472:boolean in(int):1460 -> d
-    473:475:int firstIntKey():1718:1720 -> d
-    476:476:int firstIntKey():1719:1719 -> d
+    1:3:int lastIntKey():1725:1727 -> g
+    4:4:int lastIntKey():1726:1726 -> g
     1:1:java.lang.Object get(int):1608:1608 -> get
-    1:3:int lastIntKey():1725:1727 -> h
-    4:4:int lastIntKey():1726:1726 -> h
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> i
+    10:244:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> i
+    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> i
+    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685:1689 -> i
+    250:484:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> i
+    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689 -> i
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1742 -> isEmpty
     1:1:boolean isEmpty():1641 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1009:1009 -> isEmpty
@@ -49755,23 +50115,17 @@
     2:2:boolean isEmpty():1641 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1743:1743 -> isEmpty
     3:3:boolean isEmpty():1641 -> isEmpty
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1677:1685 -> j
+    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1700:1708 -> j
     10:244:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> j
-    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685 -> j
-    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1685:1689 -> j
+    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708 -> j
+    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708:1712 -> j
     250:484:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> j
-    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry firstEntry():1689 -> j
-    1:9:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1700:1708 -> k
-    10:244:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> k
-    10:244:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708 -> k
-    245:249:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1708:1712 -> k
-    250:484:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> k
-    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1712 -> k
+    250:484:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry lastEntry():1712 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():1560:1561 -> keySet
     1:4:java.lang.Object remove(int):1622:1625 -> remove
     1:5:int size():1630:1634 -> size
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1566:1583 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.bf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.of:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1465:1465 -> <init>
     1:1:void clear():1517:1517 -> clear
@@ -49801,19 +50155,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465:1465 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1542:1542 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.cf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.pf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1566:1566 -> <init>
     1:1:void clear():1580:1580 -> clear
     1:1:boolean contains(java.lang.Object):1572:1572 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1568:1568 -> iterator
     1:1:int size():1576:1576 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.af$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.nf$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1548:1548 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1548:1548 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator iterator():1550:1550 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.af$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.nf$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1773:1773 -> <init>
     1:1:void add(java.lang.Object):1772:1772 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1797:1797 -> add
@@ -49825,7 +50179,7 @@
     1:1:void set(java.lang.Object):1772:1772 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap$Entry):1792:1792 -> set
     2:2:void set(java.lang.Object):1772 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.af$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.nf$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1742:1743 -> <init>
     1:2:void updateNext():1767:1768 -> n
@@ -49836,7 +50190,7 @@
     3:237:int com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap.compare(int,int):0:234 -> o
     3:237:void updatePrevious():1763 -> o
     238:238:void updatePrevious():1763:1763 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.af$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.nf$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1813:1813 -> <init>
     1:1:void add(java.lang.Object):1811:1811 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.add(java.lang.Integer):1861:1861 -> add
@@ -49850,14 +50204,14 @@
     1:1:void set(java.lang.Object):1811:1811 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapKeyIterator.set(java.lang.Integer):1855:1855 -> set
     2:2:void set(java.lang.Object):1811 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.af$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.nf$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap):1875:1875 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1875:1875 -> <init>
     1:1:void add(java.lang.Object):1893:1893 -> add
     1:1:java.lang.Object next():1878:1878 -> next
     1:1:java.lang.Object previous():1883:1883 -> previous
     1:1:void set(java.lang.Object):1888:1888 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.af$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.nf$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry prev -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$Entry curr -> c
@@ -49874,27 +50228,27 @@
     1:1:void updatePrevious():1042:1042 -> o
     1:1:int previousIndex():1058:1058 -> previousIndex
     1:12:void remove():1062:1062 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.af$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.nf$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap):1312:1312 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceRBTreeMap$1):1312:1312 -> <init>
     1:1:void add(java.lang.Object):1330:1330 -> add
     1:1:java.lang.Object next():1315:1315 -> next
     1:1:java.lang.Object previous():1320:1320 -> previous
     1:1:void set(java.lang.Object):1325:1325 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.df:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap -> com.android.tools.r8.internal.qf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(java.lang.Integer,java.lang.Integer) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer) -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer) -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet int2ReferenceEntrySet() -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int) -> b
+    int firstIntKey() -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int) -> c
-    int firstIntKey() -> d
-    int lastIntKey() -> h
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.ff:
+    int lastIntKey() -> g
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps -> com.android.tools.r8.internal.sf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap EMPTY_MAP -> a
     1:1:void <clinit>():185:185 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.ef:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMaps$EmptySortedMap -> com.android.tools.r8.internal.rf:
     1:1:void <init>():60:60 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap subMap(int,int):95:95 -> a
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(java.lang.Integer):141:141 -> a
@@ -49904,14 +50258,14 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):107:107 -> b
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):129:129 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):101:101 -> c
-    1:1:int firstIntKey():112:112 -> d
+    2:2:int firstIntKey():112:112 -> c
     1:1:java.util.Set entrySet():57:57 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():84:84 -> entrySet
     1:1:java.lang.Object firstKey():57:57 -> firstKey
     2:2:java.lang.Integer firstKey():165:165 -> firstKey
-    1:1:int lastIntKey():117:117 -> h
+    1:1:int lastIntKey():117:117 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57:57 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):57:57 -> headMap
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():57:57 -> i
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():57:57 -> keySet
     2:2:java.util.Set keySet():57:57 -> keySet
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():89:89 -> keySet
@@ -49919,7 +50273,7 @@
     2:2:java.lang.Integer lastKey():177:177 -> lastKey
     1:1:java.util.SortedMap subMap(java.lang.Object,java.lang.Object):57:57 -> subMap
     1:1:java.util.SortedMap tailMap(java.lang.Object):57:57 -> tailMap
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.hf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList -> com.android.tools.r8.internal.uf:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -49961,7 +50315,7 @@
     6:6:void grow(int):250:250 -> m
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.gf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList$1 -> com.android.tools.r8.internal.tf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -49976,7 +50330,7 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.jf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet -> com.android.tools.r8.internal.wf:
     int size -> b
     1:2:void <init>():55:56 -> <init>
     3:4:void <init>(int):65:66 -> <init>
@@ -49998,25 +50352,25 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:6:boolean remove(int):153:158 -> remove
     1:1:int size():148:148 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.if:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet$1 -> com.android.tools.r8.internal.vf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:int nextInt():129:129 -> j
     1:2:void remove():135:136 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.kf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrays -> com.android.tools.r8.internal.xf:
     int[] EMPTY_ARRAY -> a
     1:1:void <clinit>():100:100 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.lf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntBidirectionalIterator -> com.android.tools.r8.internal.yf:
     int previousInt() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.nf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection -> com.android.tools.r8.internal.Af:
     boolean add(int) -> a
     boolean contains(int) -> b
     int[] toIntArray() -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.qf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections -> com.android.tools.r8.internal.Df:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):536:536 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.of:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$EmptyCollection -> com.android.tools.r8.internal.Bf:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):96:96 -> a
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
@@ -50027,7 +50381,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.pf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Cf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection):369:371 -> <init>
     1:1:boolean add(java.lang.Object):365:365 -> add
@@ -50051,18 +50405,18 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):422:422 -> toArray
     2:2:java.lang.Object[] toArray():427:427 -> toArray
     1:1:java.lang.String toString():512:512 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.rf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.tf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntComparator -> com.android.tools.r8.internal.Ef:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator -> com.android.tools.r8.internal.Gf:
     int nextInt() -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.xf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators -> com.android.tools.r8.internal.Kf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.uf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$EmptyIterator -> com.android.tools.r8.internal.Hf:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:int previousInt():62:62 -> e
     1:1:int nextInt():57:57 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.internal.vf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$SingletonIterator -> com.android.tools.r8.internal.If:
     int curr -> b
     int element -> a
     1:2:void <init>(int):110:111 -> <init>
@@ -50072,12 +50426,12 @@
     1:4:int nextInt():126:126 -> j
     1:1:int nextIndex():140:140 -> nextIndex
     1:1:int previousIndex():145:145 -> previousIndex
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.wf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Jf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator):807:808 -> <init>
     1:1:boolean hasNext():813:813 -> hasNext
     1:1:int nextInt():818:818 -> j
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.yf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList -> com.android.tools.r8.internal.Lf:
     boolean add(int) -> a
     boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList) -> a
     void getElements(int,int[],int,int) -> a
@@ -50086,13 +50440,13 @@
     int set(int,int) -> c
     int removeInt(int) -> d
     int getInt(int) -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.zf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Bf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntListIterator -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists -> com.android.tools.r8.internal.Of:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList EMPTY_LIST -> a
     1:1:void <clinit>():323:323 -> <clinit>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList singleton(int):478:478 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.internal.Af:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Bf$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1 -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList -> com.android.tools.r8.internal.Of$a:
     1:1:void <init>():65:65 -> <init>
     1:1:boolean addAll(com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList):110:110 -> a
     2:2:boolean add(java.lang.Integer):156:156 -> a
@@ -50132,7 +50486,7 @@
     2:2:java.lang.Object set(int,java.lang.Object):62 -> set
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntList com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$EmptyList.subList(int,int):246:246 -> subList
     1:1:java.util.List subList(int,int):62 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.internal.Cf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$Singleton -> com.android.tools.r8.internal.Pf:
     int element -> a
     1:1:void <init>(int,com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntLists$1):332:332 -> <init>
     2:3:void <init>(int):336:337 -> <init>
@@ -50162,7 +50516,7 @@
     1:1:boolean removeAll(java.util.Collection):409:409 -> removeAll
     1:1:boolean retainAll(java.util.Collection):414:414 -> retainAll
     1:1:java.util.List subList(int,int):332:332 -> subList
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.If:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet -> com.android.tools.r8.internal.Vf:
     float f -> g
     int size -> f
     int n -> d
@@ -50215,8 +50569,8 @@
     2:5:boolean remove(int):365 -> remove
     6:13:boolean remove(int):369:376 -> remove
     1:1:int size():412:412 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.Gf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Hf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$1 -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet$SetIterator -> com.android.tools.r8.internal.Uf:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntOpenHashSet this$0 -> f
     int last -> b
@@ -50234,21 +50588,21 @@
     14:22:void remove():532 -> remove
     23:24:void remove():535:536 -> remove
     25:25:void remove():528:528 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.Of:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.Qf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets -> com.android.tools.r8.internal.dg:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():76:76 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.Pf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSets$EmptySet -> com.android.tools.r8.internal.cg:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean rem(int):64:64 -> g
     1:1:boolean remove(int):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.Rf:
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.Tf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet -> com.android.tools.r8.internal.eg:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets -> com.android.tools.r8.internal.gg:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():168:168 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.Sf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet -> com.android.tools.r8.internal.fg:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():155:155 -> clone
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.first():139:139 -> first
@@ -50264,7 +50618,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):39:39 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSets$EmptySet.tailSet(java.lang.Integer):128:128 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):39 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.Uf:
+com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntStack -> com.android.tools.r8.internal.hg:
 com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceMap -> com.android.tools.r8.internal.L:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -50279,10 +50633,10 @@
     5:5:boolean equals(java.lang.Object):299:299 -> equals
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.get(java.lang.Object):120:121 -> get
     1:2:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():707:708 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():49 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273:273 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():707:708 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.long2ReferenceEntrySet():49 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():273 -> h
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.longs.AbstractLong2ReferenceFunction.put(java.lang.Long,java.lang.Object):135:137 -> put
@@ -50505,10 +50859,9 @@
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet.size():745:745 -> hashCode
     2:2:int hashCode():57 -> hashCode
     3:8:int hashCode():58:63 -> hashCode
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap -> com.android.tools.r8.internal.an:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.Ym:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.Zm:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.cn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$Entry -> com.android.tools.r8.internal.ln:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceMap$FastEntrySet -> com.android.tools.r8.internal.mn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap -> com.android.tools.r8.internal.on:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> j
     java.lang.Object[] value -> b
     long[] key -> a
@@ -50549,8 +50902,8 @@
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():971 -> hashCode
     2:10:int hashCode():972:980 -> hashCode
+    1:5:java.lang.Object removeNullEntry():228:232 -> i
     1:1:boolean isEmpty():391:391 -> isEmpty
-    1:5:java.lang.Object removeNullEntry():228:232 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.keySet():768:769 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):238:238 -> putAll
@@ -50565,14 +50918,14 @@
     1:1:int size():386:386 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap.values():794:815 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.bn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1 -> com.android.tools.r8.internal.nn:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):794:794 -> <init>
     1:1:void clear():812:812 -> clear
     1:1:boolean contains(java.lang.Object):807:807 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():797:797 -> iterator
     1:1:int size():802:802 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.cn$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator -> com.android.tools.r8.internal.on$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):600:600 -> <init>
@@ -50580,13 +50933,13 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$EntryIterator.next():605:605 -> next
     1:1:java.lang.Object next():600 -> next
     1:2:void remove():610:611 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.cn$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator -> com.android.tools.r8.internal.on$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):721:722 -> <init>
     1:1:long nextLong():727:727 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeyIterator.next():733:733 -> next
     1:1:java.lang.Object next():720 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.cn$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$KeySet -> com.android.tools.r8.internal.on$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):737:737 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):737:737 -> <init>
@@ -50594,7 +50947,7 @@
     1:1:boolean contains(long):750:750 -> b
     1:1:void clear():762:762 -> clear
     1:1:int size():745:745 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.cn$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntry -> com.android.tools.r8.internal.on$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,int):430:431 -> <init>
@@ -50605,7 +50958,7 @@
     1:1:int hashCode():476:476 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):449:450 -> setValue
     1:1:java.lang.String toString():481:481 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.cn$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.on$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):625:625 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$1):625:625 -> <init>
@@ -50614,7 +50967,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():627:627 -> iterator
     1:29:boolean remove(java.lang.Object):659:687 -> remove
     1:1:int size():696:696 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.cn$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$MapIterator -> com.android.tools.r8.internal.on$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList wrapped -> e
     int last -> b
@@ -50632,11 +50985,11 @@
     15:24:void remove():580 -> remove
     25:26:void remove():583:584 -> remove
     27:27:void remove():576:576 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.cn$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap$ValueIterator -> com.android.tools.r8.internal.on$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap):782:783 -> <init>
     1:1:java.lang.Object next():788:788 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.en:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList -> com.android.tools.r8.internal.qn:
     int size -> b
     1:3:void <init>(int):81:83 -> <init>
     4:4:void <init>(int):82:82 -> <init>
@@ -50662,7 +51015,7 @@
     1:2:java.util.ListIterator listIterator(int):48 -> listIterator
     1:6:boolean removeAll(java.util.Collection):482:487 -> removeAll
     1:1:int size():327:327 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.dn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList$1 -> com.android.tools.r8.internal.pn:
     com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -50677,18 +51030,18 @@
     1:1:int nextIndex():516:516 -> nextIndex
     1:1:int previousIndex():520:520 -> previousIndex
     1:10:void remove():534:534 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.fn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongBidirectionalIterator -> com.android.tools.r8.internal.rn:
     long previousLong() -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.gn:
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.in:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection -> com.android.tools.r8.internal.sn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator -> com.android.tools.r8.internal.un:
     long nextLong() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.jn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongList -> com.android.tools.r8.internal.vn:
     void add(int,long) -> a
     void removeElements(int,int) -> a
     long set(int,long) -> b
     long getLong(int) -> c
     long removeLong(int) -> f
-com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.mn:
+com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongSet -> com.android.tools.r8.internal.yn:
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanMap -> com.android.tools.r8.internal.i0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2BooleanFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -50781,8 +51134,8 @@
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.get(java.lang.Object):0 -> get
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
     1:4:int hashCode():310:313 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.keySet():37:37 -> keySet
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
@@ -50824,12 +51177,12 @@
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> entrySet
     2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> entrySet
     2:3:java.util.Set entrySet():31 -> entrySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229:229 -> i
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229:229 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():87 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2IntSortedMap.entrySet():229 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongMap -> com.android.tools.r8.internal.m0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -50855,10 +51208,10 @@
     13:13:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):41 -> get
     13:13:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():761:762 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():49 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():761:762 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():49 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> h
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractObject2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
@@ -51107,10 +51460,10 @@
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():716:717 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():49 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():716:717 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.reference2BooleanEntrySet():49 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> h
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2BooleanFunction.put(java.lang.Object,java.lang.Boolean):123:125 -> put
@@ -51151,8 +51504,8 @@
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.get(java.lang.Object):0 -> get
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
     1:4:int hashCode():310:313 -> hashCode
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
     1:1:java.util.Set com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.keySet():37:37 -> keySet
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntFunction.put(java.lang.Object,java.lang.Object):0 -> put
@@ -51193,11 +51546,11 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> entrySet
     2:2:java.util.Set entrySet():31 -> entrySet
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229:229 -> i
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> i
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> i
-    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229:229 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.reference2IntEntrySet():87:87 -> h
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2IntSortedMap.entrySet():229 -> h
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():31 -> h
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongMap -> com.android.tools.r8.internal.F0:
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.<init>():44:44 -> <init>
     1:1:void <init>():45 -> <init>
@@ -51214,10 +51567,10 @@
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):41 -> get
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.get(java.lang.Object):0 -> get
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():761:762 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> i
-    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297:297 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():761:762 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.reference2LongEntrySet():49 -> h
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():297 -> h
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):41:41 -> put
     1:1:java.lang.Object com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Object):0 -> put
     2:4:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReference2LongFunction.put(java.lang.Object,java.lang.Long):123:125 -> put
@@ -51340,7 +51693,7 @@
     1:7:int hashCode():57:63 -> hashCode
 com.android.tools.r8.it.unimi.dsi.fastutil.objects.AbstractReferenceSortedSet -> com.android.tools.r8.internal.L0:
     1:1:void <init>():23:23 -> <init>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.sq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap -> com.android.tools.r8.internal.Eq:
     java.lang.Object[] key -> a
     boolean[] value -> b
     int size -> c
@@ -51361,16 +51714,16 @@
     1:1:boolean[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):37:37 -> d
     2:4:int findKey(java.lang.Object):235:237 -> d
     1:3:boolean getBoolean(java.lang.Object):244:246 -> e
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.object2BooleanEntrySet():231:231 -> i
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> i
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.object2BooleanEntrySet():231:231 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2BooleanEntrySet():37 -> h
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:java.util.Set keySet():37:37 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> keySet
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.qq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.sq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1 -> com.android.tools.r8.internal.Cq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet -> com.android.tools.r8.internal.Eq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$1):133:133 -> <init>
@@ -51380,7 +51733,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.rq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Dq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -51389,9 +51742,9 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.internal.tq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.tq$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap -> com.android.tools.r8.internal.Fq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap$Entry -> com.android.tools.r8.internal.Fq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap -> com.android.tools.r8.internal.Iq:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -51414,15 +51767,15 @@
     1:1:boolean containsKey(java.lang.Object):265:265 -> containsKey
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):37:37 -> d
     2:3:boolean containsValue(int):270:271 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.object2IntEntrySet():231:231 -> g
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():37 -> g
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.object2IntEntrySet():231:231 -> f
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():37 -> f
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():321:321 -> keySet
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.uq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.wq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1 -> com.android.tools.r8.internal.Gq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Iq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$1):133:133 -> <init>
@@ -51432,7 +51785,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.vq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Hq:
     int next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet this$1 -> c
     int curr -> a
@@ -51441,10 +51794,10 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntFunction -> com.android.tools.r8.internal.Jq:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Lq:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -51479,10 +51832,10 @@
     1:11:boolean containsKey(java.lang.Object):738:748 -> containsKey
     1:5:boolean containsValue(int):754:758 -> d
     1:25:void fixPointers(int):899:923 -> f
+    26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> f
+    26:27:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():87 -> f
     1:3:java.lang.Object firstKey():970:970 -> firstKey
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.object2IntEntrySet():1422:1423 -> g
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():87 -> g
-    3:44:void rehash(int):1709:1750 -> g
+    1:42:void rehash(int):1709:1750 -> g
     1:3:int removeEntry(int):276:278 -> h
     4:9:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.shiftKeys(int):410:415 -> h
     4:9:int removeEntry(int):279 -> h
@@ -51494,8 +51847,8 @@
     2:10:int hashCode():1796:1804 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.headMap(java.lang.Object):1002:1002 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):87 -> headMap
+    1:6:int removeNullEntry():285:290 -> i
     1:1:boolean isEmpty():785:785 -> isEmpty
-    1:6:int removeNullEntry():285:290 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():1531:1532 -> keySet
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():87 -> keySet
     3:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.keySet():1531:1532 -> keySet
@@ -51517,14 +51870,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap.values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.yq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Kq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
     1:1:void clear():1614:1614 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.zq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Lq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -51539,14 +51892,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.zq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Lq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.zq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Lq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -51566,7 +51919,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.zq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Lq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -51585,7 +51938,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.zq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Lq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -51607,7 +51960,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.zq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Lq$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -51625,7 +51978,7 @@
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.zq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Lq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -51640,11 +51993,11 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.Cq:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> g
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.Aq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.Bq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.Eq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap -> com.android.tools.r8.internal.Oq:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet() -> f
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$Entry -> com.android.tools.r8.internal.Mq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet -> com.android.tools.r8.internal.Nq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap -> com.android.tools.r8.internal.Qq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keys -> j
     java.lang.Object[] key -> b
     int[] value -> c
@@ -51672,23 +52025,23 @@
     11:11:java.lang.Object clone():49 -> clone
     1:11:boolean containsKey(java.lang.Object):388:398 -> containsKey
     1:5:boolean containsValue(int):404:408 -> d
-    1:7:void rehash(int):961:967 -> f
-    8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.realSize():205:205 -> f
-    8:8:void rehash(int):968 -> f
-    9:21:void rehash(int):969:981 -> f
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.object2IntEntrySet():761:762 -> f
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():49 -> f
+    3:9:void rehash(int):961:967 -> f
+    10:10:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.realSize():205:205 -> f
+    10:10:void rehash(int):968 -> f
+    11:23:void rehash(int):969:981 -> f
     1:2:int removeEntry(int):219:220 -> g
     3:8:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.shiftKeys(int):333:338 -> g
     3:8:int removeEntry(int):221 -> g
     9:9:int removeEntry(int):222:222 -> g
     10:15:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.shiftKeys(int):341:346 -> g
     10:15:int removeEntry(int):221 -> g
-    16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.object2IntEntrySet():761:762 -> g
-    16:17:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2IntEntrySet():49 -> g
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
+    1:5:int removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
-    1:5:int removeNullEntry():227:231 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet keySet():816:817 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.ensureCapacity(int):209:210 -> putAll
@@ -51702,14 +52055,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.Dq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1 -> com.android.tools.r8.internal.Pq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Eq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Qq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):654:654 -> <init>
@@ -51717,11 +52070,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Eq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Qq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Eq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Qq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):785:785 -> <init>
@@ -51730,7 +52083,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Eq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Qq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,int):473:474 -> <init>
@@ -51749,7 +52102,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Eq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Qq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$1):679:679 -> <init>
@@ -51758,7 +52111,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Eq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Qq$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     int last -> b
@@ -51776,17 +52129,17 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Eq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Qq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Fq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.Gq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.Gq$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.Hq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.Jq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Rq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap -> com.android.tools.r8.internal.Sq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$Entry -> com.android.tools.r8.internal.Sq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet -> com.android.tools.r8.internal.Tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap -> com.android.tools.r8.internal.Vq:
     java.lang.Object[] key -> a
     long[] value -> b
     int maxFill -> f
@@ -51827,10 +52180,10 @@
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():761:762 -> i
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.object2LongEntrySet():761:762 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2LongEntrySet():49 -> j
-    1:5:long removeNullEntry():227:231 -> k
+    1:5:long removeNullEntry():227:231 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.keySet():816:817 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -51845,14 +52198,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.Iq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1 -> com.android.tools.r8.internal.Uq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Jq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Vq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry entry -> g
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> h
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):654:654 -> <init>
@@ -51860,11 +52213,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Jq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Vq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Jq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.Vq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):785:785 -> <init>
@@ -51873,7 +52226,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Jq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.Vq$d:
     int index -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,int):473:474 -> <init>
@@ -51892,7 +52245,7 @@
     5:5:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntry.setValue(java.lang.Long):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Jq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Vq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$1):679:679 -> <init>
@@ -51901,7 +52254,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Jq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.Vq$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList wrapped -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> f
     int last -> b
@@ -51919,13 +52272,13 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Jq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Vq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.Lq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap -> com.android.tools.r8.internal.Xq:
     java.lang.Object[] value -> b
     int maxFill -> j
     java.lang.Object[] key -> a
@@ -51964,14 +52317,14 @@
     13:19:java.lang.Object removeEntry(int):309 -> f
     1:3:java.lang.Object firstKey():927:927 -> firstKey
     1:11:java.lang.Object get(java.lang.Object):701:711 -> get
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> h
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.realSize():291:291 -> hashCode
     1:1:int hashCode():1729 -> hashCode
     2:10:int hashCode():1730:1738 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.headMap(java.lang.Object):959:959 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):85 -> headMap
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet object2ObjectEntrySet():1379:1380 -> i
+    1:7:java.lang.Object removeNullEntry():315:321 -> i
     1:1:boolean isEmpty():766:766 -> isEmpty
-    1:7:java.lang.Object removeNullEntry():315:321 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.keySet():1488:1489 -> keySet
     1:2:java.util.Set keySet():85 -> keySet
     1:3:java.lang.Object lastKey():938:938 -> lastKey
@@ -51995,14 +52348,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap.values():1529:1550 -> values
     1:22:java.util.Collection values():85 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.Kq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1 -> com.android.tools.r8.internal.Wq:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1529:1529 -> <init>
     1:1:void clear():1547:1547 -> clear
     1:1:boolean contains(java.lang.Object):1542:1542 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1532:1532 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.Lq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$EntryIterator -> com.android.tools.r8.internal.Xq$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1181:1181 -> <init>
@@ -52017,14 +52370,14 @@
     1:1:void set(java.lang.Object):1178:1178 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1170:1170 -> set
     2:2:void set(java.lang.Object):1178 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.Lq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeyIterator -> com.android.tools.r8.internal.Xq$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1412:1413 -> <init>
     1:1:void add(java.lang.Object):1409:1409 -> add
     1:1:java.lang.Object next():1418:1418 -> next
     1:1:java.lang.Object previous():1399:1399 -> previous
     1:1:void set(java.lang.Object):1404:1404 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.Lq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet -> com.android.tools.r8.internal.Xq$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1422:1422 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1422:1422 -> <init>
@@ -52044,7 +52397,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1422 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$KeySet.tailSet(java.lang.Object):1472:1472 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1422 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.Lq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntry -> com.android.tools.r8.internal.Xq$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,int):805:806 -> <init>
@@ -52054,7 +52407,7 @@
     1:1:int hashCode():839:839 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):824:825 -> setValue
     1:1:java.lang.String toString():844:844 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.Lq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet -> com.android.tools.r8.internal.Xq$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1228:1228 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$1):1228:1228 -> <init>
@@ -52076,7 +52429,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1228:1228 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry):1250:1250 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1228 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.Lq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$MapIterator -> com.android.tools.r8.internal.Xq$f:
     int index -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> e
     int next -> b
@@ -52094,17 +52447,17 @@
     1:2:int previousIndex():1079:1080 -> previousIndex
     1:49:void remove():1102:1150 -> remove
     50:50:void remove():1103:1103 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.Lq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap$ValueIterator -> com.android.tools.r8.internal.Xq$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenCustomHashMap):1517:1518 -> <init>
     1:1:void add(java.lang.Object):1514:1514 -> add
     1:1:java.lang.Object next():1523:1523 -> next
     1:1:java.lang.Object previous():1504:1504 -> previous
     1:1:void set(java.lang.Object):1509:1509 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.Nq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.Mq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.Oq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.Qq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectMap$Entry -> com.android.tools.r8.internal.Yq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ObjectSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap -> com.android.tools.r8.internal.cr:
     java.lang.Object[] key -> b
     java.lang.Object[] value -> c
     int maxFill -> j
@@ -52146,13 +52499,13 @@
     13:19:java.lang.Object removeEntry(int):278 -> f
     1:3:java.lang.Object firstKey():896:896 -> firstKey
     1:11:java.lang.Object get(java.lang.Object):670:680 -> get
+    1:7:java.lang.Object removeNullEntry():284:290 -> h
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.realSize():260:260 -> hashCode
     1:1:int hashCode():1697 -> hashCode
     2:10:int hashCode():1698:1706 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):928:928 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.headMap(java.lang.Object):928:928 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):85 -> headMap
-    1:7:java.lang.Object removeNullEntry():284:290 -> i
     1:1:boolean isEmpty():735:735 -> isEmpty
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1457:1458 -> keySet
     1:3:java.lang.Object lastKey():907:907 -> lastKey
@@ -52177,14 +52530,14 @@
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap.tailMap(java.lang.Object):918:918 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):85 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1498:1519 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Pq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1 -> com.android.tools.r8.internal.br:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1498:1498 -> <init>
     1:1:void clear():1516:1516 -> clear
     1:1:boolean contains(java.lang.Object):1511:1511 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1501:1501 -> iterator
     1:1:int size():1506:1506 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Qq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.cr$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1150:1150 -> <init>
@@ -52199,14 +52552,14 @@
     1:1:void set(java.lang.Object):1147:1147 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1139:1139 -> set
     2:2:void set(java.lang.Object):1147 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Qq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.cr$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1381:1382 -> <init>
     1:1:void add(java.lang.Object):1378:1378 -> add
     1:1:java.lang.Object next():1387:1387 -> next
     1:1:java.lang.Object previous():1368:1368 -> previous
     1:1:void set(java.lang.Object):1373:1373 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Qq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.cr$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1391:1391 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1391:1391 -> <init>
@@ -52226,7 +52579,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1391 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1441:1441 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1391 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Qq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.cr$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,int):774:775 -> <init>
@@ -52236,7 +52589,7 @@
     1:1:int hashCode():808:808 -> hashCode
     1:2:java.lang.Object setValue(java.lang.Object):793:794 -> setValue
     1:1:java.lang.String toString():813:813 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Qq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.cr$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1197:1197 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$1):1197:1197 -> <init>
@@ -52258,7 +52611,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1197:1197 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1219:1219 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1197 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Qq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.cr$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -52276,17 +52629,17 @@
     1:2:int previousIndex():1048:1049 -> previousIndex
     1:49:void remove():1071:1119 -> remove
     50:50:void remove():1072:1072 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Qq$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.cr$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceLinkedOpenHashMap):1486:1487 -> <init>
     1:1:void add(java.lang.Object):1483:1483 -> add
     1:1:java.lang.Object next():1492:1492 -> next
     1:1:java.lang.Object previous():1473:1473 -> previous
     1:1:void set(java.lang.Object):1478:1478 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.Sq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap -> com.android.tools.r8.internal.er:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet object2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.Rq:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.Xq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry -> com.android.tools.r8.internal.dr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap -> com.android.tools.r8.internal.jr:
     java.util.Comparator actualComparator -> k
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
@@ -52343,10 +52696,10 @@
     5:5:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry locateKey(java.lang.Object):254:254 -> d
     1:3:java.lang.Object firstKey():956:956 -> firstKey
     1:2:java.lang.Object get(java.lang.Object):950:951 -> get
+    1:2:void allocatePaths():268:269 -> h
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1342:1342 -> headMap
-    1:2:void allocatePaths():268:269 -> i
+    1:1:void setActualComparator():98:98 -> i
     1:1:boolean isEmpty():944:944 -> isEmpty
-    1:1:void setActualComparator():98:98 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1261:1262 -> keySet
     1:3:java.lang.Object lastKey():962:962 -> lastKey
     1:11:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.add(java.lang.Object):296:306 -> put
@@ -52413,7 +52766,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap subMap(java.lang.Object,java.lang.Object):1352:1352 -> subMap
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1347:1347 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1311:1332 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.Uq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 -> com.android.tools.r8.internal.gr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
     java.util.Comparator comparator -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1116:1117 -> <init>
@@ -52436,20 +52789,20 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1116:1116 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1189:1189 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1116 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.Tq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1 -> com.android.tools.r8.internal.fr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1 this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1117:1117 -> <init>
     1:1:int compare(java.lang.Object,java.lang.Object):1117:1117 -> compare
     2:2:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1$1.compare(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1119:1119 -> compare
     2:2:int compare(java.lang.Object,java.lang.Object):1117 -> compare
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.Vq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$2 -> com.android.tools.r8.internal.hr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1311:1311 -> <init>
     1:1:void clear():1329:1329 -> clear
     1:1:boolean contains(java.lang.Object):1319:1319 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1314:1314 -> iterator
     1:1:int size():1324:1324 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.Wq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry -> com.android.tools.r8.internal.ir:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry right -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry left -> c
     int info -> e
@@ -52476,7 +52829,7 @@
     1:1:boolean succ():757:757 -> i
     1:2:java.lang.Object setValue(java.lang.Object):876:877 -> setValue
     1:1:java.lang.String toString():911:911 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.Xq$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator -> com.android.tools.r8.internal.jr$a:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1086:1086 -> <init>
     1:1:void add(java.lang.Object):1085:1085 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1110:1110 -> add
@@ -52488,18 +52841,18 @@
     1:1:void set(java.lang.Object):1085:1085 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$EntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1105:1105 -> set
     2:2:void set(java.lang.Object):1085 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.Xq$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeyIterator -> com.android.tools.r8.internal.jr$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1206:1206 -> <init>
     1:1:void add(java.lang.Object):1230:1230 -> add
     1:1:java.lang.Object next():1215:1215 -> next
     1:1:java.lang.Object previous():1220:1220 -> previous
     1:1:void set(java.lang.Object):1225:1225 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.Xq$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$KeySet -> com.android.tools.r8.internal.jr$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1237:1237 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1237:1237 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1239:1239 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.Xq$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap -> com.android.tools.r8.internal.jr$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> i
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keys -> g
@@ -52525,11 +52878,12 @@
     1:3:java.lang.Object firstKey():1679:1681 -> firstKey
     4:4:java.lang.Object firstKey():1680:1680 -> firstKey
     1:1:java.lang.Object get(java.lang.Object):1569:1569 -> get
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry firstEntry():1638:1650 -> h
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1612:1613 -> headMap
     3:3:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap.compare(java.lang.Object,java.lang.Object):220:220 -> headMap
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1613 -> headMap
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap headMap(java.lang.Object):1613:1613 -> headMap
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry firstEntry():1638:1650 -> i
+    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry lastEntry():1661:1673 -> i
     1:1:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1703 -> isEmpty
     1:1:boolean isEmpty():1602 -> isEmpty
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):998:998 -> isEmpty
@@ -52537,7 +52891,6 @@
     2:2:boolean isEmpty():1602 -> isEmpty
     3:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator.<init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1704:1704 -> isEmpty
     3:3:boolean isEmpty():1602 -> isEmpty
-    1:13:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry lastEntry():1661:1673 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet keySet():1521:1522 -> keySet
     1:3:java.lang.Object lastKey():1686:1688 -> lastKey
     4:4:java.lang.Object lastKey():1687:1687 -> lastKey
@@ -52556,7 +52909,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1619 -> tailMap
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap tailMap(java.lang.Object):1619:1619 -> tailMap
     1:18:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection values():1527:1544 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.Yq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1 -> com.android.tools.r8.internal.kr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1428:1428 -> <init>
     1:1:void clear():1478:1478 -> clear
@@ -52586,19 +52939,19 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1428:1428 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$1.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1503:1503 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1428 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.Zq:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$2 -> com.android.tools.r8.internal.lr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1527:1527 -> <init>
     1:1:void clear():1541:1541 -> clear
     1:1:boolean contains(java.lang.Object):1533:1533 -> contains
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():1529:1529 -> iterator
     1:1:int size():1537:1537 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.Xq$d$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$KeySet -> com.android.tools.r8.internal.jr$d$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1509:1509 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1509:1509 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator iterator():1511:1511 -> iterator
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.Xq$d$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator -> com.android.tools.r8.internal.jr$d$b:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1734:1734 -> <init>
     1:1:void add(java.lang.Object):1733:1733 -> add
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.add(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1758:1758 -> add
@@ -52610,25 +52963,25 @@
     1:1:void set(java.lang.Object):1733:1733 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapEntryIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceMap$Entry):1753:1753 -> set
     2:2:void set(java.lang.Object):1733 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.Xq$d$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapIterator -> com.android.tools.r8.internal.jr$d$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap this$1 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1703:1704 -> <init>
     1:2:void updateNext():1728:1729 -> n
     1:2:void updatePrevious():1723:1724 -> o
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.Xq$d$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapKeyIterator -> com.android.tools.r8.internal.jr$d$d:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1774:1774 -> <init>
     1:1:void add(java.lang.Object):1798:1798 -> add
     1:1:java.lang.Object next():1783:1783 -> next
     1:1:java.lang.Object previous():1788:1788 -> previous
     1:1:void set(java.lang.Object):1793:1793 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.Xq$d$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap$SubmapValueIterator -> com.android.tools.r8.internal.jr$d$e:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap):1812:1812 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Submap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1812:1812 -> <init>
     1:1:void add(java.lang.Object):1830:1830 -> add
     1:1:java.lang.Object next():1815:1815 -> next
     1:1:java.lang.Object previous():1820:1820 -> previous
     1:1:void set(java.lang.Object):1825:1825 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.Xq$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$TreeIterator -> com.android.tools.r8.internal.jr$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap this$0 -> e
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry next -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$Entry prev -> a
@@ -52645,17 +52998,17 @@
     1:1:void updatePrevious():1031:1031 -> o
     1:1:int previousIndex():1047:1047 -> previousIndex
     1:12:void remove():1051:1051 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.Xq$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$ValueIterator -> com.android.tools.r8.internal.jr$f:
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap):1275:1275 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceRBTreeMap$1):1275:1275 -> <init>
     1:1:void add(java.lang.Object):1293:1293 -> add
     1:1:java.lang.Object next():1278:1278 -> next
     1:1:java.lang.Object previous():1283:1283 -> previous
     1:1:void set(java.lang.Object):1288:1288 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap -> com.android.tools.r8.internal.br:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap -> com.android.tools.r8.internal.nr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet object2ReferenceEntrySet() -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.ar:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.hr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2ReferenceSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.mr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList -> com.android.tools.r8.internal.tr:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -52678,7 +53031,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.gr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList$1 -> com.android.tools.r8.internal.sr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -52693,7 +53046,7 @@
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.jr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet -> com.android.tools.r8.internal.vr:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):29:29 -> a
@@ -52713,19 +53066,19 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.ir:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet$1 -> com.android.tools.r8.internal.ur:
     int next -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet this$0 -> b
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.kr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectArrays -> com.android.tools.r8.internal.wr:
     java.lang.Object[] EMPTY_ARRAY -> a
     1:1:void <clinit>():88:88 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.lr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.mr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.nr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectBidirectionalIterator -> com.android.tools.r8.internal.xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollection -> com.android.tools.r8.internal.yr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectCollections$EmptyCollection -> com.android.tools.r8.internal.zr:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -52734,37 +53087,37 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.or:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.rr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators -> com.android.tools.r8.internal.Dr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator EMPTY_ITERATOR -> a
     1:1:void <clinit>():103:103 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.pr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$EmptyIterator -> com.android.tools.r8.internal.Br:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():87:87 -> clone
     1:1:java.lang.Object next():57:57 -> next
     1:1:java.lang.Object previous():62:62 -> previous
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.qr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterators$UnmodifiableIterator -> com.android.tools.r8.internal.Cr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator i -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator):739:740 -> <init>
     1:1:boolean hasNext():745:745 -> hasNext
     1:1:java.lang.Object next():750:750 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.sr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectList -> com.android.tools.r8.internal.Er:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.tr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.vr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.xr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectListIterator -> com.android.tools.r8.internal.Fr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet -> com.android.tools.r8.internal.Hr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets -> com.android.tools.r8.internal.Jr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.wr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSets$EmptySet -> com.android.tools.r8.internal.Ir:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.yr:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.Ar:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet -> com.android.tools.r8.internal.Kr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets -> com.android.tools.r8.internal.Mr:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():114:114 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.zr:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet -> com.android.tools.r8.internal.Lr:
     1:1:void <init>():43:43 -> <init>
     1:1:java.lang.Object clone():101:101 -> clone
     1:1:java.lang.Object first():86:86 -> first
@@ -52775,10 +53128,9 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):40 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSets$EmptySet.tailSet(java.lang.Object):81:81 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):40 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap -> com.android.tools.r8.internal.Nv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.Lv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.Mv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.Pv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$Entry -> com.android.tools.r8.internal.gw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanMap$FastEntrySet -> com.android.tools.r8.internal.hw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap -> com.android.tools.r8.internal.jw:
     com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection values -> j
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
@@ -52820,8 +53172,8 @@
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():980 -> hashCode
     2:10:int hashCode():981:989 -> hashCode
+    1:5:boolean removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():389:389 -> isEmpty
-    1:5:boolean removeNullEntry():227:231 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.keySet():771:772 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -52836,14 +53188,14 @@
     1:1:int size():384:384 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap.values():803:824 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.Ov:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1 -> com.android.tools.r8.internal.iw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):803:803 -> <init>
     1:1:boolean contains(boolean):816:816 -> b
     1:1:void clear():821:821 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.booleans.BooleanIterator iterator():806:806 -> iterator
     1:1:int size():811:811 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Pv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator -> com.android.tools.r8.internal.jw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):609:609 -> <init>
@@ -52851,11 +53203,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$EntryIterator.next():614:614 -> next
     1:1:java.lang.Object next():609 -> next
     1:2:void remove():619:620 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Pv$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeyIterator -> com.android.tools.r8.internal.jw$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):730:731 -> <init>
     1:1:java.lang.Object next():736:736 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.Pv$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$KeySet -> com.android.tools.r8.internal.jw$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):740:740 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):740:740 -> <init>
@@ -52864,7 +53216,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():743:743 -> iterator
     1:3:boolean remove(java.lang.Object):758:760 -> remove
     1:1:int size():748:748 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.Pv$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry -> com.android.tools.r8.internal.jw$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,int):428:429 -> <init>
@@ -52882,7 +53234,7 @@
     5:5:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntry.setValue(java.lang.Boolean):473:473 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):423 -> setValue
     1:1:java.lang.String toString():491:491 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Pv$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.jw$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):634:634 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$1):634:634 -> <init>
@@ -52891,7 +53243,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():636:636 -> iterator
     1:29:boolean remove(java.lang.Object):668:696 -> remove
     1:1:int size():705:705 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.Pv$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$MapIterator -> com.android.tools.r8.internal.jw$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -52909,13 +53261,13 @@
     14:23:void remove():589 -> remove
     24:25:void remove():592:593 -> remove
     26:26:void remove():585:585 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Pv$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator -> com.android.tools.r8.internal.jw$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap):785:786 -> <init>
     1:1:boolean nextBoolean():791:791 -> f
     1:1:java.lang.Boolean com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap$ValueIterator.next():797:797 -> next
     1:1:java.lang.Object next():784 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.Sv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap -> com.android.tools.r8.internal.mw:
     java.lang.Object[] key -> b
     int[] value -> c
     int size -> d
@@ -52935,16 +53287,16 @@
     7:7:java.lang.Object clone():37 -> clone
     1:1:boolean containsKey(java.lang.Object):265:265 -> containsKey
     1:1:int[] access$200(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):37:37 -> d
-    2:3:boolean containsValue(int):270:271 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.reference2IntEntrySet():231:231 -> e
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> e
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.reference2IntEntrySet():231:231 -> d
+    2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():37 -> d
+    3:4:boolean containsValue(int):270:271 -> d
     1:1:boolean isEmpty():277:277 -> isEmpty
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():321:321 -> keySet
     1:1:int size():252:252 -> size
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap.values():326:326 -> values
     1:1:java.util.Collection values():37 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.Qv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.Sv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1 -> com.android.tools.r8.internal.kw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet -> com.android.tools.r8.internal.mw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap):133:133 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$1):133:133 -> <init>
@@ -52954,7 +53306,7 @@
     2:2:java.util.Iterator iterator():133 -> iterator
     1:12:boolean remove(java.lang.Object):213:224 -> remove
     1:1:int size():197:197 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.Rv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1 -> com.android.tools.r8.internal.lw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet this$1 -> c
     int next -> b
     int curr -> a
@@ -52963,11 +53315,11 @@
     1:3:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntArrayMap$EntrySet$1.next():147:147 -> next
     1:3:java.lang.Object next():136 -> next
     1:7:void remove():153:153 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.Tv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntFunction -> com.android.tools.r8.internal.nw:
     int getInt(java.lang.Object) -> a
     int put(java.lang.Object,int) -> a
     int removeInt(java.lang.Object) -> b
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.Vv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap -> com.android.tools.r8.internal.pw:
     java.lang.Object[] key -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection values -> n
     int maxFill -> j
@@ -53000,8 +53352,8 @@
     12:12:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.clone():1770:1770 -> clone
     12:12:java.lang.Object clone():87 -> clone
     1:10:boolean containsKey(java.lang.Object):738:747 -> containsKey
-    1:5:boolean containsValue(int):754:758 -> d
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> e
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():87:87 -> d
+    2:6:boolean containsValue(int):754:758 -> d
     1:25:void fixPointers(int):899:923 -> f
     1:3:java.lang.Object firstKey():970:970 -> firstKey
     1:42:void rehash(int):1709:1750 -> g
@@ -53016,12 +53368,12 @@
     2:10:int hashCode():1796:1804 -> hashCode
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.headMap(java.lang.Object):1002:1002 -> headMap
     1:1:java.util.SortedMap headMap(java.lang.Object):87 -> headMap
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> i
     1:1:boolean isEmpty():785:785 -> isEmpty
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet keySet():1531:1532 -> j
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> k
+    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet reference2IntEntrySet():1422:1423 -> j
+    1:6:int removeNullEntry():285:290 -> k
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():87:87 -> keySet
     2:2:java.util.Set keySet():87:87 -> keySet
-    1:6:int removeNullEntry():285:290 -> l
     1:3:java.lang.Object lastKey():981:981 -> lastKey
     1:1:void putAll(java.util.Map):296:296 -> putAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.ensureCapacity(int):266:267 -> putAll
@@ -53039,14 +53391,14 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):87 -> tailMap
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap.values():1596:1617 -> values
     1:22:java.util.Collection values():87 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.Uv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1 -> com.android.tools.r8.internal.ow:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1596:1596 -> <init>
     1:1:boolean contains(int):1609:1609 -> b
     1:1:void clear():1614:1614 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():1599:1599 -> iterator
     1:1:int size():1604:1604 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Vv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$EntryIterator -> com.android.tools.r8.internal.pw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry entry -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1222:1222 -> <init>
@@ -53061,14 +53413,14 @@
     1:1:void set(java.lang.Object):1219:1219 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator.set(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1211:1211 -> set
     2:2:void set(java.lang.Object):1219 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Vv$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeyIterator -> com.android.tools.r8.internal.pw$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1455:1456 -> <init>
     1:1:void add(java.lang.Object):1452:1452 -> add
     1:1:java.lang.Object next():1461:1461 -> next
     1:1:java.lang.Object previous():1442:1442 -> previous
     1:1:void set(java.lang.Object):1447:1447 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.Vv$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet -> com.android.tools.r8.internal.pw$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1465:1465 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1465:1465 -> <init>
@@ -53088,7 +53440,7 @@
     1:1:java.util.SortedSet subSet(java.lang.Object,java.lang.Object):1465 -> subSet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$KeySet.tailSet(java.lang.Object):1515:1515 -> tailSet
     1:1:java.util.SortedSet tailSet(java.lang.Object):1465 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.Vv$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry -> com.android.tools.r8.internal.pw$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,int):824:825 -> <init>
@@ -53107,7 +53459,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntry.setValue(java.lang.Integer):869:869 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):819 -> setValue
     1:1:java.lang.String toString():887:887 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Vv$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.pw$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1269:1269 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$1):1269:1269 -> <init>
@@ -53129,7 +53481,7 @@
     1:1:java.util.SortedSet tailSet(java.lang.Object):1269:1269 -> tailSet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapEntrySet.tailSet(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry):1291:1291 -> tailSet
     2:2:java.util.SortedSet tailSet(java.lang.Object):1269 -> tailSet
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.Vv$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$MapIterator -> com.android.tools.r8.internal.pw$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> e
     int index -> d
     int next -> b
@@ -53147,7 +53499,7 @@
     1:2:int previousIndex():1122:1123 -> previousIndex
     1:47:void remove():1145:1191 -> remove
     48:48:void remove():1146:1146 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Vv$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator -> com.android.tools.r8.internal.pw$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap this$0 -> f
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap):1578:1579 -> <init>
     1:1:void add(java.lang.Object):1544:1544 -> add
@@ -53162,11 +53514,11 @@
     1:1:void set(java.lang.Object):1544:1544 -> set
     2:2:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntLinkedOpenHashMap$ValueIterator.set(java.lang.Integer):1559:1559 -> set
     2:2:void set(java.lang.Object):1544 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.Wv:
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> e
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.Wv$a:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.Xv:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.Zv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap -> com.android.tools.r8.internal.qw:
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet() -> d
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$Entry -> com.android.tools.r8.internal.qw$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet -> com.android.tools.r8.internal.rw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap -> com.android.tools.r8.internal.tw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet entries -> i
     java.lang.Object[] key -> b
     int[] value -> c
@@ -53196,8 +53548,8 @@
     11:11:java.lang.Object clone():49 -> clone
     1:10:boolean containsKey(java.lang.Object):388:397 -> containsKey
     1:5:boolean containsValue(int):404:408 -> d
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.reference2IntEntrySet():761:762 -> e
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> e
+    6:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap$FastEntrySet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.reference2IntEntrySet():761:762 -> d
+    6:7:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet reference2IntEntrySet():49 -> d
     1:7:void rehash(int):961:967 -> f
     8:8:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.realSize():205:205 -> f
     8:8:void rehash(int):968 -> f
@@ -53211,8 +53563,8 @@
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
+    1:5:int removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
-    1:5:int removeNullEntry():227:231 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keySet():816:817 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
     2:3:void com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.ensureCapacity(int):209:210 -> putAll
@@ -53226,14 +53578,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.Yv:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1 -> com.android.tools.r8.internal.sw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):848:848 -> <init>
     1:1:boolean contains(int):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntIterator iterator():851:851 -> iterator
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.Zv$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator -> com.android.tools.r8.internal.tw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):654:654 -> <init>
@@ -53241,11 +53593,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.Zv$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeyIterator -> com.android.tools.r8.internal.tw$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.Zv$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$KeySet -> com.android.tools.r8.internal.tw$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):785:785 -> <init>
@@ -53254,7 +53606,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.Zv$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry -> com.android.tools.r8.internal.tw$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,int):473:474 -> <init>
@@ -53273,7 +53625,7 @@
     5:5:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntry.setValue(java.lang.Integer):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.Zv$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.tw$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$1):679:679 -> <init>
@@ -53282,7 +53634,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.Zv$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$MapIterator -> com.android.tools.r8.internal.tw$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -53300,17 +53652,16 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.Zv$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator -> com.android.tools.r8.internal.tw$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap):830:831 -> <init>
     1:1:int nextInt():836:836 -> j
     1:1:java.lang.Integer com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.aw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap -> com.android.tools.r8.internal.dw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.bw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.cw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.fw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntSortedMap$FastSortedEntrySet -> com.android.tools.r8.internal.uw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$Entry -> com.android.tools.r8.internal.vw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet -> com.android.tools.r8.internal.ww:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap -> com.android.tools.r8.internal.yw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet keys -> i
     java.lang.Object[] key -> a
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongMap$FastEntrySet entries -> h
@@ -53351,8 +53702,8 @@
     1:1:int com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.realSize():205:205 -> hashCode
     1:1:int hashCode():1025 -> hashCode
     2:10:int hashCode():1026:1034 -> hashCode
+    1:5:long removeNullEntry():227:231 -> i
     1:1:boolean isEmpty():434:434 -> isEmpty
-    1:5:long removeNullEntry():227:231 -> j
     1:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.keySet():816:817 -> keySet
     1:2:java.util.Set keySet():49 -> keySet
     1:1:void putAll(java.util.Map):237:237 -> putAll
@@ -53367,14 +53718,14 @@
     1:1:int size():429:429 -> size
     1:22:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongCollection com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap.values():848:869 -> values
     1:22:java.util.Collection values():49 -> values
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.ew:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1 -> com.android.tools.r8.internal.xw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):848:848 -> <init>
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.longs.LongIterator iterator():851:851 -> a
     1:1:boolean contains(long):861:861 -> b
     1:1:void clear():866:866 -> clear
     1:1:int size():856:856 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.fw$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator -> com.android.tools.r8.internal.yw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> h
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry entry -> g
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):654:654 -> <init>
@@ -53382,11 +53733,11 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$EntryIterator.next():659:659 -> next
     1:1:java.lang.Object next():654 -> next
     1:2:void remove():664:665 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.fw$b:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeyIterator -> com.android.tools.r8.internal.yw$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):775:776 -> <init>
     1:1:java.lang.Object next():781:781 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.fw$c:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$KeySet -> com.android.tools.r8.internal.yw$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):785:785 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):785:785 -> <init>
@@ -53395,7 +53746,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():788:788 -> iterator
     1:3:boolean remove(java.lang.Object):803:805 -> remove
     1:1:int size():793:793 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.fw$d:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry -> com.android.tools.r8.internal.yw$d:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> b
     int index -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,int):473:474 -> <init>
@@ -53413,7 +53764,7 @@
     5:5:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntry.setValue(java.lang.Long):518:518 -> setValue
     5:5:java.lang.Object setValue(java.lang.Object):468 -> setValue
     1:1:java.lang.String toString():536:536 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.fw$e:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapEntrySet -> com.android.tools.r8.internal.yw$e:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):679:679 -> <init>
     2:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$1):679:679 -> <init>
@@ -53422,7 +53773,7 @@
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():681:681 -> iterator
     1:29:boolean remove(java.lang.Object):713:741 -> remove
     1:1:int size():750:750 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.fw$f:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$MapIterator -> com.android.tools.r8.internal.yw$f:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
     int pos -> a
@@ -53440,13 +53791,13 @@
     14:23:void remove():634 -> remove
     24:25:void remove():637:638 -> remove
     26:26:void remove():630:630 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.fw$g:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator -> com.android.tools.r8.internal.yw$g:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap this$0 -> g
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap):830:831 -> <init>
     1:1:long nextLong():836:836 -> a
     1:1:java.lang.Long com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2LongOpenHashMap$ValueIterator.next():842:842 -> next
     1:1:java.lang.Object next():829 -> next
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.hw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList -> com.android.tools.r8.internal.Aw:
     int size -> b
     1:3:void <init>(int):96:98 -> <init>
     4:4:void <init>(int):97:97 -> <init>
@@ -53469,7 +53820,7 @@
     1:7:boolean removeAll(java.util.Collection):485:491 -> removeAll
     1:4:java.lang.Object set(int,java.lang.Object):357:357 -> set
     1:1:int size():372:372 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.gw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList$1 -> com.android.tools.r8.internal.zw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList this$0 -> d
     int last -> b
     int val$index -> c
@@ -53484,7 +53835,7 @@
     1:1:int previousIndex():524:524 -> previousIndex
     1:10:void remove():538:538 -> remove
     1:3:void set(java.lang.Object):533:533 -> set
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.jw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet -> com.android.tools.r8.internal.Cw:
     int size -> b
     1:4:void <init>(java.lang.Object[],int):104:107 -> <init>
     1:1:int access$000(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):29:29 -> a
@@ -53504,17 +53855,17 @@
     2:2:java.util.Iterator iterator():29 -> iterator
     1:7:boolean remove(java.lang.Object):154:160 -> remove
     1:1:int size():149:149 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.iw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet$1 -> com.android.tools.r8.internal.Bw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet this$0 -> b
     int next -> a
     1:2:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArraySet):119:120 -> <init>
     1:1:boolean hasNext():124:124 -> hasNext
     1:3:java.lang.Object next():129:129 -> next
     1:3:void remove():135:137 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.kw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.nw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection -> com.android.tools.r8.internal.Dw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections -> com.android.tools.r8.internal.Gw:
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection unmodifiable(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):383:383 -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.lw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$EmptyCollection -> com.android.tools.r8.internal.Ew:
     1:1:void <init>():39:39 -> <init>
     1:1:boolean addAll(java.util.Collection):81:81 -> addAll
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectIterator iterator():38:38 -> iterator
@@ -53522,7 +53873,7 @@
     1:1:boolean removeAll(java.util.Collection):86:86 -> removeAll
     1:1:boolean retainAll(java.util.Collection):91:91 -> retainAll
     1:1:java.lang.Object[] toArray():49:49 -> toArray
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.mw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollections$UnmodifiableCollection -> com.android.tools.r8.internal.Fw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection collection -> a
     1:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceCollection):276:278 -> <init>
     1:1:boolean add(java.lang.Object):283:283 -> add
@@ -53544,9 +53895,9 @@
     1:1:java.lang.Object[] toArray(java.lang.Object[]):329:329 -> toArray
     2:2:java.lang.Object[] toArray():334:334 -> toArray
     1:1:java.lang.String toString():359:359 -> toString
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.ow:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceList -> com.android.tools.r8.internal.Hw:
     void removeElements(int,int) -> a
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.qw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet -> com.android.tools.r8.internal.Jw:
     java.lang.Object[] key -> a
     float f -> g
     int size -> f
@@ -53593,8 +53944,8 @@
     2:5:boolean remove(java.lang.Object):332 -> remove
     6:13:boolean remove(java.lang.Object):336:343 -> remove
     1:1:int size():380:380 -> size
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.pw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.qw$a:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$1 -> com.android.tools.r8.internal.Iw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet$SetIterator -> com.android.tools.r8.internal.Jw$a:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceArrayList wrapped -> e
     int last -> b
@@ -53612,16 +53963,16 @@
     14:22:void remove():500 -> remove
     23:24:void remove():503:504 -> remove
     25:25:void remove():496:496 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.rw:
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.tw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSet -> com.android.tools.r8.internal.Kw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets -> com.android.tools.r8.internal.Mw:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet EMPTY_SET -> a
     1:1:void <clinit>():70:70 -> <clinit>
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.sw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSets$EmptySet -> com.android.tools.r8.internal.Lw:
     1:1:void <init>():42:42 -> <init>
     1:1:java.lang.Object clone():52:52 -> clone
     1:1:boolean equals(java.lang.Object):58:58 -> equals
     1:1:boolean remove(java.lang.Object):47:47 -> remove
-com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.uw:
+com.android.tools.r8.it.unimi.dsi.fastutil.objects.ReferenceSortedSet -> com.android.tools.r8.internal.Nw:
 com.android.tools.r8.jar.CfApplicationWriter -> com.android.tools.r8.internal.e3:
     com.android.tools.r8.graph.GraphLens graphLens -> e
     com.android.tools.r8.graph.AppView appView -> d
@@ -53633,107 +53984,117 @@
     boolean $assertionsDisabled -> b
     java.util.function.Predicate isTypeMissing -> i
     com.android.tools.r8.naming.ProguardMapSupplier proguardMapSupplier -> j
-    1:19:void <clinit>():69:87 -> <clinit>
-    1:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):94:104 -> <init>
+    1:20:void <clinit>():71:90 -> <clinit>
+    1:11:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.dex.Marker,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.naming.ProguardMapSupplier):97:107 -> <init>
     1:1:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
-    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):400 -> a
-    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):399:399 -> a
+    1:1:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):413 -> a
+    2:2:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):412:412 -> a
     3:3:int com.android.tools.r8.graph.ParameterAnnotationsList.getAnnotableParameterCount():66:66 -> a
-    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):402 -> a
-    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):401:408 -> a
-    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):406:406 -> a
-    13:17:void write(com.android.tools.r8.ClassFileConsumer):108:112 -> a
-    18:18:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):165:165 -> a
+    3:3:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):415 -> a
+    4:11:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):414:421 -> a
+    12:12:void writeParameterAnnotations(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.ParameterAnnotationsList):419:419 -> a
+    13:17:void write(com.android.tools.r8.ClassFileConsumer):111:115 -> a
+    18:18:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):168:168 -> a
     19:19:void com.android.tools.r8.org.objectweb.asm.ClassWriter.<init>(int):229:229 -> a
-    19:19:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):165 -> a
-    20:24:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):166:170 -> a
-    25:31:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):283:289 -> a
-    25:31:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):170 -> a
-    32:32:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):171:171 -> a
-    33:40:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):259:266 -> a
-    33:40:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):172 -> a
-    41:67:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):173:199 -> a
-    68:78:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):293:303 -> a
-    68:78:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):199 -> a
-    79:116:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):201:238 -> a
-    117:121:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):42:46 -> a
-    117:121:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):238 -> a
-    122:122:void lambda$writeClass$0(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):225:225 -> a
-    123:123:void lambda$writeClass$1(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):239:239 -> a
-    124:127:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):243:246 -> a
-    128:128:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    128:128:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):247 -> a
-    129:129:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):247:247 -> a
-    130:138:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):246:254 -> a
-    139:146:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):272:279 -> a
-    147:153:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):328:334 -> a
-    154:157:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):321:324 -> a
-    154:157:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):335 -> a
-    158:159:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):336:337 -> a
-    160:160:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):347:347 -> a
-    161:161:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
-    161:161:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):348 -> a
-    162:162:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):348:348 -> a
-    163:163:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():318:318 -> a
-    163:163:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):349 -> a
-    164:168:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):352:356 -> a
-    169:177:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):307:315 -> a
-    169:177:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):356 -> a
-    178:186:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):357:365 -> a
-    187:200:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):375:388 -> a
-    187:200:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):365 -> a
-    201:203:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):366:368 -> a
-    204:205:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):508:509 -> a
-    204:205:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):369 -> a
-    206:206:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$2(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):407:407 -> a
-    207:216:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):417:426 -> a
-    217:222:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):425:430 -> a
-    223:224:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):436:437 -> a
-    225:281:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):442:498 -> a
-    282:285:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):492:492 -> a
-    286:286:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):488:488 -> a
-    287:287:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):485:485 -> a
-    288:288:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):482:482 -> a
-    289:289:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):479:479 -> a
-    290:290:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):476:476 -> a
-    291:293:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):470:472 -> a
-    294:294:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):471:471 -> a
-    295:301:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):458:464 -> a
-    302:305:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):445:448 -> a
-    306:310:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):447:451 -> a
-    1:6:void writeApplication(com.android.tools.r8.ClassFileConsumer):117:122 -> b
+    19:19:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):168 -> a
+    20:24:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):169:173 -> a
+    25:31:java.lang.String com.android.tools.r8.jar.CfApplicationWriter.getSourceDebugExtension(com.android.tools.r8.graph.DexAnnotationSet):296:302 -> a
+    25:31:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):173 -> a
+    32:32:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):174:174 -> a
+    33:40:com.android.tools.r8.cf.CfVersion com.android.tools.r8.jar.CfApplicationWriter.getClassFileVersion(com.android.tools.r8.graph.DexProgramClass):272:279 -> a
+    33:40:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):175 -> a
+    41:67:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):176:202 -> a
+    68:78:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.jar.CfApplicationWriter.getAnnotationDefaults(com.android.tools.r8.graph.DexAnnotationSet):306:316 -> a
+    68:78:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):202 -> a
+    79:104:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):204:229 -> a
+    105:105:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452:452 -> a
+    105:105:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):230 -> a
+    106:106:java.lang.Object com.android.tools.r8.com.google.common.base.Preconditions.checkNotNull(java.lang.Object):787:787 -> a
+    106:106:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452 -> a
+    106:106:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):230 -> a
+    107:107:java.util.TreeSet com.android.tools.r8.com.google.common.collect.Sets.newTreeSet(java.util.Comparator):452:452 -> a
+    107:107:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):230 -> a
+    108:127:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):232:251 -> a
+    128:132:void com.android.tools.r8.utils.ExceptionUtils.withConsumeResourceHandler(com.android.tools.r8.utils.Reporter,java.util.function.Consumer):42:46 -> a
+    128:132:void writeClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ClassFileConsumer,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,java.util.Optional):251 -> a
+    133:133:int lambda$writeClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):231:231 -> a
+    134:134:void lambda$writeClass$1(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):234:234 -> a
+    135:135:void lambda$writeClass$3(com.android.tools.r8.ClassFileConsumer,byte[],java.lang.String,com.android.tools.r8.DiagnosticsHandler):252:252 -> a
+    136:139:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):256:259 -> a
+    140:140:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    140:140:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):260 -> a
+    141:141:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):260:260 -> a
+    142:150:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):259:267 -> a
+    151:158:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):285:292 -> a
+    159:165:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):341:347 -> a
+    166:169:java.lang.Object com.android.tools.r8.jar.CfApplicationWriter.getStaticValue(com.android.tools.r8.graph.DexEncodedField):334:337 -> a
+    166:169:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):348 -> a
+    170:171:void writeField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.org.objectweb.asm.ClassWriter):349:350 -> a
+    172:172:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):360:360 -> a
+    173:173:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
+    173:173:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):361 -> a
+    174:174:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):361:361 -> a
+    175:175:boolean com.android.tools.r8.graph.DexEncodedMethod.isDeprecated():318:318 -> a
+    175:175:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):362 -> a
+    176:180:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):365:369 -> a
+    181:189:java.lang.String[] com.android.tools.r8.jar.CfApplicationWriter.getExceptions(com.android.tools.r8.graph.DexAnnotationSet):320:328 -> a
+    181:189:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):369 -> a
+    190:198:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):370:378 -> a
+    199:212:void com.android.tools.r8.jar.CfApplicationWriter.writeMethodParametersAnnotation(com.android.tools.r8.org.objectweb.asm.MethodVisitor,com.android.tools.r8.graph.DexAnnotation[]):388:401 -> a
+    199:212:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):378 -> a
+    213:215:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):379:381 -> a
+    216:217:void com.android.tools.r8.jar.CfApplicationWriter.writeCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.MethodVisitor):521:522 -> a
+    216:217:void writeMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap):382 -> a
+    218:218:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor lambda$writeParameterAnnotations$4(com.android.tools.r8.org.objectweb.asm.MethodVisitor,int,java.lang.String,boolean):420:420 -> a
+    219:228:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):430:439 -> a
+    229:234:void writeAnnotations(com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer,com.android.tools.r8.graph.DexAnnotation[]):438:443 -> a
+    235:236:void writeAnnotation(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,com.android.tools.r8.graph.DexEncodedAnnotation):449:450 -> a
+    237:293:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):455:511 -> a
+    294:297:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):505:505 -> a
+    298:298:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):501:501 -> a
+    299:299:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):498:498 -> a
+    300:300:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):495:495 -> a
+    301:301:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):492:492 -> a
+    302:302:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):489:489 -> a
+    303:305:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):483:485 -> a
+    306:306:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):484:484 -> a
+    307:313:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):471:477 -> a
+    314:317:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):458:461 -> a
+    318:322:void writeAnnotationElement(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,com.android.tools.r8.graph.DexValue):460:464 -> a
+    1:6:void writeApplication(com.android.tools.r8.ClassFileConsumer):120:125 -> b
     7:7:void com.android.tools.r8.ir.conversion.LensCodeRewriterUtils.<init>(com.android.tools.r8.graph.AppView):42:42 -> b
-    7:7:void writeApplication(com.android.tools.r8.ClassFileConsumer):122 -> b
-    8:10:void writeApplication(com.android.tools.r8.ClassFileConsumer):123:125 -> b
-    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> b
-    11:11:void writeApplication(com.android.tools.r8.ClassFileConsumer):126 -> b
-    12:39:void writeApplication(com.android.tools.r8.ClassFileConsumer):126:153 -> b
-    40:52:void writeApplication(com.android.tools.r8.ClassFileConsumer):129:141 -> b
-    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
-    53:53:void writeApplication(com.android.tools.r8.ClassFileConsumer):145 -> b
-    54:56:void writeApplication(com.android.tools.r8.ClassFileConsumer):147:149 -> b
-    57:61:void writeApplication(com.android.tools.r8.ClassFileConsumer):146:150 -> b
-    62:62:void writeApplication(com.android.tools.r8.ClassFileConsumer):143:143 -> b
-    63:64:void writeApplication(com.android.tools.r8.ClassFileConsumer):131:132 -> b
-    65:65:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
-    65:65:void writeApplication(com.android.tools.r8.ClassFileConsumer):136 -> b
-    66:67:void writeApplication(com.android.tools.r8.ClassFileConsumer):137:138 -> b
-    68:90:void writeApplication(com.android.tools.r8.ClassFileConsumer):134:156 -> b
+    7:7:void writeApplication(com.android.tools.r8.ClassFileConsumer):125 -> b
+    8:10:void writeApplication(com.android.tools.r8.ClassFileConsumer):126:128 -> b
+    11:11:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> b
+    11:11:void writeApplication(com.android.tools.r8.ClassFileConsumer):129 -> b
+    12:39:void writeApplication(com.android.tools.r8.ClassFileConsumer):129:156 -> b
+    40:52:void writeApplication(com.android.tools.r8.ClassFileConsumer):132:144 -> b
+    53:53:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> b
+    53:53:void writeApplication(com.android.tools.r8.ClassFileConsumer):148 -> b
+    54:56:void writeApplication(com.android.tools.r8.ClassFileConsumer):150:152 -> b
+    57:61:void writeApplication(com.android.tools.r8.ClassFileConsumer):149:153 -> b
+    62:62:void writeApplication(com.android.tools.r8.ClassFileConsumer):146:146 -> b
+    63:64:void writeApplication(com.android.tools.r8.ClassFileConsumer):134:135 -> b
+    65:65:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> b
+    65:65:void writeApplication(com.android.tools.r8.ClassFileConsumer):139 -> b
+    66:67:void writeApplication(com.android.tools.r8.ClassFileConsumer):140:141 -> b
+    68:90:void writeApplication(com.android.tools.r8.ClassFileConsumer):137:159 -> b
+    91:91:void lambda$writeClass$2(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.ir.conversion.LensCodeRewriterUtils,com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.graph.ProgramMethod):237:237 -> b
 com.android.tools.r8.jar.CfApplicationWriter$AnnotationConsumer -> com.android.tools.r8.internal.d3:
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visit(java.lang.String,boolean) -> a
-com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.X7:
+com.android.tools.r8.jetbrains.kotlin.DeprecationLevel -> com.android.tools.r8.internal.c8:
 # {"id":"sourceFile","fileName":"Annotations.kt"}
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlin.DeprecationLevel[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):63:63 -> <init>
-com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.internal.Tk:
+com.android.tools.r8.jetbrains.kotlin.KotlinNullPointerException -> com.android.tools.r8.internal.hl:
 # {"id":"sourceFile","fileName":"KotlinNullPointerException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.Sl:
+com.android.tools.r8.jetbrains.kotlin.Lazy -> com.android.tools.r8.internal.fm:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.Xl:
+com.android.tools.r8.jetbrains.kotlin.LazyKt -> com.android.tools.r8.internal.km:
     1:22:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0:21 -> a
     1:22:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
     23:23:void com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.<init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55:55 -> a
@@ -53748,19 +54109,19 @@
     64:64:void com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.<init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0,java.lang.Object,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):55:55 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyJVMKt.lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):35 -> a
     64:64:com.android.tools.r8.jetbrains.kotlin.Lazy lazy(com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):0 -> a
-com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.internal.Yl:
+com.android.tools.r8.jetbrains.kotlin.LazyKt__LazyKt -> com.android.tools.r8.internal.lm:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
-com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.Zl:
+com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode -> com.android.tools.r8.internal.mm:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode PUBLICATION -> b
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode NONE -> c
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode SYNCHRONIZED -> a
     com.android.tools.r8.jetbrains.kotlin.LazyThreadSafetyMode[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):49:49 -> <init>
-com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.Yp:
+com.android.tools.r8.jetbrains.kotlin.NoWhenBranchMatchedException -> com.android.tools.r8.internal.kq:
 # {"id":"sourceFile","fileName":"NoWhenBranchMatchedException.kt"}
     1:1:void <init>():9:9 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.ms:
+com.android.tools.r8.jetbrains.kotlin.Pair -> com.android.tools.r8.internal.ys:
 # {"id":"sourceFile","fileName":"Tuples.kt"}
     java.lang.Object second -> b
     java.lang.Object first -> a
@@ -53770,7 +54131,7 @@
     1:1:java.lang.Object getFirst():27:27 -> c
     1:1:java.lang.Object getSecond():28:28 -> d
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.internal.ux:
+com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl -> com.android.tools.r8.internal.Nx:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> b
     java.util.concurrent.atomic.AtomicReferenceFieldUpdater valueUpdater -> a
@@ -53781,7 +54142,7 @@
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.SafePublicationLazyImpl.isInitialized():117:117 -> toString
     1:1:java.lang.String toString():119 -> toString
     2:2:java.lang.String toString():119:119 -> toString
-com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.Rz:
+com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl -> com.android.tools.r8.internal.kA:
 # {"id":"sourceFile","fileName":"LazyJVM.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -53792,23 +54153,23 @@
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.SynchronizedLazyImpl.isInitialized():82:82 -> toString
     1:1:java.lang.String toString():84 -> toString
     2:2:java.lang.String toString():84:84 -> toString
-com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.internal.BB:
+com.android.tools.r8.jetbrains.kotlin.TypeCastException -> com.android.tools.r8.internal.VB:
 # {"id":"sourceFile","fileName":"TypeCastException.kt"}
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.PB:
+com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE -> com.android.tools.r8.internal.jC:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.UNINITIALIZED_VALUE INSTANCE -> a
     1:1:void <clinit>():71:71 -> <clinit>
     1:1:void <init>():71:71 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.VB:
+com.android.tools.r8.jetbrains.kotlin.UninitializedPropertyAccessException -> com.android.tools.r8.internal.qC:
 # {"id":"sourceFile","fileName":"UninitializedPropertyAccessException.kt"}
     1:1:void <init>(java.lang.String):11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.YB:
+com.android.tools.r8.jetbrains.kotlin.Unit -> com.android.tools.r8.internal.tC:
 # {"id":"sourceFile","fileName":"Unit.kt"}
     com.android.tools.r8.jetbrains.kotlin.Unit INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:1:void <init>():22:22 -> <init>
-com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.gC:
+com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl -> com.android.tools.r8.internal.BC:
 # {"id":"sourceFile","fileName":"Lazy.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 initializer -> a
     java.lang.Object _value -> b
@@ -53818,7 +54179,7 @@
     1:1:boolean com.android.tools.r8.jetbrains.kotlin.UnsafeLazyImpl.isInitialized():88:88 -> toString
     1:1:java.lang.String toString():90 -> toString
     2:2:java.lang.String toString():90:90 -> toString
-com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.dE:
+com.android.tools.r8.jetbrains.kotlin._Assertions -> com.android.tools.r8.internal.TE:
 # {"id":"sourceFile","fileName":"AssertionsJVM.kt"}
     boolean ENABLED -> a
     1:1:void <clinit>():14:14 -> <clinit>
@@ -54028,12 +54389,12 @@
     13831:13832:int lastIndexOf(java.lang.Object):162 -> lastIndexOf
 com.android.tools.r8.jetbrains.kotlin.collections.ArraysKt___ArraysKt -> com.android.tools.r8.internal.B1:
 # {"id":"sourceFile","fileName":"_Arrays.kt"}
-com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.N6:
+com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1 -> com.android.tools.r8.internal.S6:
 # {"id":"sourceFile","fileName":"_Collections.kt"}
     java.lang.Iterable $this_withIndex -> a
     1:1:java.util.Iterator com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt___CollectionsKt$withIndex$1.invoke():1387:1387 -> a
     1:1:java.lang.Object invoke():0 -> a
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.h9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator -> com.android.tools.r8.internal.q9:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -54042,7 +54403,7 @@
     1:1:java.lang.Object next():13 -> next
     1:1:java.lang.Void com.android.tools.r8.jetbrains.kotlin.collections.EmptyIterator.previous():19:19 -> previous
     1:1:java.lang.Object previous():13 -> previous
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.i9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyList -> com.android.tools.r8.internal.r9:
 # {"id":"sourceFile","fileName":"Collections.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyList INSTANCE -> a
     1:1:void <clinit>():22:22 -> <clinit>
@@ -54065,7 +54426,7 @@
     2:2:java.util.ListIterator listIterator(int):42:42 -> listIterator
     3:3:java.util.ListIterator listIterator(int):41:41 -> listIterator
     1:1:java.util.List subList(int,int):47:47 -> subList
-com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.j9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap -> com.android.tools.r8.internal.s9:
 # {"id":"sourceFile","fileName":"Maps.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptyMap INSTANCE -> a
     1:1:void <clinit>():13:13 -> <clinit>
@@ -54077,7 +54438,7 @@
     1:1:boolean equals(java.lang.Object):16:16 -> equals
     1:1:java.util.Set keySet():13:13 -> keySet
     1:1:java.util.Collection values():13:13 -> values
-com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.l9:
+com.android.tools.r8.jetbrains.kotlin.collections.EmptySet -> com.android.tools.r8.internal.u9:
 # {"id":"sourceFile","fileName":"Sets.kt"}
     com.android.tools.r8.jetbrains.kotlin.collections.EmptySet INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -54088,19 +54449,19 @@
     1:1:boolean containsAll(java.util.Collection):22:22 -> containsAll
     1:1:boolean equals(java.lang.Object):15:15 -> equals
     1:1:java.util.Iterator iterator():24:24 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.ud:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue -> com.android.tools.r8.internal.Gd:
 # {"id":"sourceFile","fileName":"IndexedValue.kt"}
     java.lang.Object value -> b
     int index -> a
     1:1:void <init>(int,java.lang.Object):14:14 -> <init>
     1:1:int getIndex():14:14 -> a
     1:1:java.lang.Object getValue():14:14 -> b
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.vd:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterable -> com.android.tools.r8.internal.Hd:
 # {"id":"sourceFile","fileName":"Iterables.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 iteratorFactory -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0):24:24 -> <init>
     1:1:java.util.Iterator iterator():25:25 -> iterator
-com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.wd:
+com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator -> com.android.tools.r8.internal.Id:
 # {"id":"sourceFile","fileName":"Iterators.kt"}
     java.util.Iterator iterator -> b
     int index -> a
@@ -54112,7 +54473,7 @@
     2:2:void com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.throwIndexOverflow():0 -> next
     2:2:com.android.tools.r8.jetbrains.kotlin.collections.IndexedValue com.android.tools.r8.jetbrains.kotlin.collections.IndexingIterator.next():40 -> next
     2:2:java.lang.Object next():37 -> next
-com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.nt:
+com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt -> com.android.tools.r8.internal.It:
 # {"id":"sourceFile","fileName":"progressionUtil.kt"}
     1:1:int mod(int,int):10:10 -> a
     2:2:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
@@ -54120,16 +54481,16 @@
     3:3:int com.android.tools.r8.jetbrains.kotlin.internal.ProgressionUtilKt.differenceModulo(int,int,int):21:21 -> a
     3:3:int getProgressionLastElement(int,int,int):47 -> a
     4:4:int getProgressionLastElement(int,int,int):48:48 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.Wk:
+com.android.tools.r8.jetbrains.kotlin.jvm.KotlinReflectionNotSupportedError -> com.android.tools.r8.internal.kl:
 # {"id":"sourceFile","fileName":"KotlinReflectionNotSupportedError.kt"}
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function0 -> com.android.tools.r8.internal.xb:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke() -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.pb:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 -> com.android.tools.r8.internal.yb:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object) -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.qb:
+com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 -> com.android.tools.r8.internal.zb:
 # {"id":"sourceFile","fileName":"Functions.kt"}
     java.lang.Object invoke(java.lang.Object,java.lang.Object) -> a
 com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver -> com.android.tools.r8.internal.Z2:
@@ -54137,7 +54498,7 @@
     1:1:void <clinit>():40:40 -> <clinit>
     1:1:void <init>():39:39 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference$NoReceiver access$000():39:39 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.U5:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference -> com.android.tools.r8.internal.Y5:
 # {"id":"sourceFile","fileName":"ClassReference.kt"}
     java.lang.Class jClass -> a
     1:1:void <init>(java.lang.Class):10:10 -> <init>
@@ -54148,7 +54509,7 @@
     2:2:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.internal.ClassReference.getJClass():10:10 -> toString
     2:2:java.lang.String toString():88 -> toString
     3:3:java.lang.String toString():88:88 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.L6:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.CollectionToArray -> com.android.tools.r8.internal.Q6:
 # {"id":"sourceFile","fileName":"CollectionToArray.kt"}
     java.lang.Object[] EMPTY -> a
     1:1:void <clinit>():130:130 -> <clinit>
@@ -54160,8 +54521,8 @@
     253:256:java.lang.Object[] toArray(java.util.Collection):83:86 -> a
     257:340:java.lang.Object[] toArray(java.util.Collection):21:104 -> a
     341:341:java.lang.Object[] toArray(java.util.Collection):23:23 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.K7:
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.jg:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker -> com.android.tools.r8.internal.P7:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics -> com.android.tools.r8.internal.wg:
     int compare(int,int) -> a
     1:1:void throwNpe():37:37 -> a
     2:2:void throwUninitializedPropertyAccessException(java.lang.String):49:49 -> a
@@ -54174,11 +54535,11 @@
     7:18:java.lang.Throwable sanitizeStackTrace(java.lang.Throwable):237 -> a
     1:15:void com.android.tools.r8.jetbrains.kotlin.jvm.internal.Intrinsics.throwParameterIsNullException(java.lang.String):127:141 -> b
     1:15:void checkParameterIsNotNull(java.lang.Object,java.lang.String):116 -> b
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.nl:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Lambda -> com.android.tools.r8.internal.Al:
 # {"id":"sourceFile","fileName":"Lambda.kt"}
     1:1:void <init>(int):10:10 -> <init>
     1:1:java.lang.String toString():11:11 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.Bt:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference -> com.android.tools.r8.internal.Wt:
     com.android.tools.r8.jetbrains.kotlin.reflect.KCallable com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.reflected -> b
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.receiver -> c
     java.lang.Object com.android.tools.r8.jetbrains.kotlin.jvm.internal.CallableReference.NO_RECEIVER -> a
@@ -54206,7 +54567,7 @@
     5:11:boolean equals(java.lang.Object):45:51 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:6:java.lang.String toString():63:68 -> toString
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.At:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1Impl -> com.android.tools.r8.internal.Vt:
     com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer owner -> d
     java.lang.String signature -> f
     java.lang.String name -> e
@@ -54257,7 +54618,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference.getReflected():25 -> e
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():34 -> e
     4:4:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1.getGetter():0 -> e
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.ww:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.Reflection -> com.android.tools.r8.internal.Pw:
     com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory factory -> a
     1:9:void <clinit>():22:30 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlin.reflect.KClass getOrCreateKotlinClass(java.lang.Class):50:50 -> a
@@ -54272,9 +54633,9 @@
     34:34:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94:94 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory.property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):0:0 -> a
     35:35:com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 property1(com.android.tools.r8.jetbrains.kotlin.jvm.internal.PropertyReference1):94 -> a
-com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.xw:
+com.android.tools.r8.jetbrains.kotlin.jvm.internal.ReflectionFactory -> com.android.tools.r8.internal.Qw:
     1:1:void <init>():11:11 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.Kf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression -> com.android.tools.r8.internal.Xf:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
     int step -> d
     int first -> b
@@ -54292,11 +54653,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.collections.IntIterator com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression.iterator():99:99 -> iterator
     1:1:java.util.Iterator iterator():72 -> iterator
     1:1:java.lang.String toString():111:111 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.internal.Jf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgression$Companion -> com.android.tools.r8.internal.Wf:
 # {"id":"sourceFile","fileName":"Progressions.kt"}
     1:1:void <init>():113:113 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):113:113 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.Lf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntProgressionIterator -> com.android.tools.r8.internal.Yf:
 # {"id":"sourceFile","fileName":"ProgressionIterators.kt"}
     int step -> d
     boolean hasNext -> b
@@ -54322,7 +54683,7 @@
     10:10:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.next():0 -> next
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0:0 -> remove
     1:1:void com.android.tools.r8.jetbrains.kotlin.collections.IntIterator.remove():0 -> remove
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.Nf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange -> com.android.tools.r8.internal.ag:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange EMPTY -> e
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion Companion -> f
@@ -54333,29 +54694,29 @@
     1:1:int hashCode():52:52 -> hashCode
     1:1:boolean isEmpty():45:45 -> isEmpty
     1:1:java.lang.String toString():54:54 -> toString
-com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.internal.Mf:
+com.android.tools.r8.jetbrains.kotlin.ranges.IntRange$Companion -> com.android.tools.r8.internal.Zf:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
     1:1:void <init>():56:56 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):56:56 -> <init>
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.internal.uv:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt -> com.android.tools.r8.internal.Pv:
     1:1:int com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt___RangesKt.coerceIn(int,int,int):1024:1024 -> a
     1:1:int coerceIn(int,int,int):0 -> a
-com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.internal.vv:
+com.android.tools.r8.jetbrains.kotlin.ranges.RangesKt__RangesKt -> com.android.tools.r8.internal.Qv:
 # {"id":"sourceFile","fileName":"Ranges.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.qi:
+com.android.tools.r8.jetbrains.kotlin.reflect.KCallable -> com.android.tools.r8.internal.Di:
 # {"id":"sourceFile","fileName":"KCallable.kt"}
     java.lang.Object call(java.lang.Object[]) -> a
-com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.ri:
+com.android.tools.r8.jetbrains.kotlin.reflect.KDeclarationContainer -> com.android.tools.r8.internal.Ei:
 # {"id":"sourceFile","fileName":"KDeclarationContainer.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.ui:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty -> com.android.tools.r8.internal.Hi:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.ti:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1 -> com.android.tools.r8.internal.Gi:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.si:
+com.android.tools.r8.jetbrains.kotlin.reflect.KProperty1$Getter -> com.android.tools.r8.internal.Fi:
 # {"id":"sourceFile","fileName":"KProperty.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.Ax:
+com.android.tools.r8.jetbrains.kotlin.sequences.Sequence -> com.android.tools.r8.internal.Tx:
 # {"id":"sourceFile","fileName":"Sequence.kt"}
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence -> com.android.tools.r8.internal.eB:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 transformer -> b
     com.android.tools.r8.jetbrains.kotlin.sequences.Sequence sequence -> a
@@ -54363,14 +54724,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlin.sequences.Sequence access$getSequence$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> a
     1:1:com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 access$getTransformer$p(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):167:167 -> b
     1:1:java.util.Iterator iterator():169:169 -> iterator
-com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.KA:
+com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence$iterator$1 -> com.android.tools.r8.internal.dB:
 # {"id":"sourceFile","fileName":"Sequences.kt"}
     java.util.Iterator iterator -> a
     com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence this$0 -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlin.sequences.TransformingSequence):169:170 -> <init>
     1:1:boolean hasNext():176:176 -> hasNext
     1:1:java.lang.Object next():172:172 -> next
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.W7:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence -> com.android.tools.r8.internal.b8:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence input -> a
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function2 getNextMatch -> d
@@ -54382,7 +54743,7 @@
     1:1:int access$getLimit$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> c
     1:1:int access$getStartIndex$p(com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence):1072:1072 -> d
     1:1:java.util.Iterator iterator():1079:1079 -> iterator
-com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.V7:
+com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1 -> com.android.tools.r8.internal.a8:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     com.android.tools.r8.jetbrains.kotlin.ranges.IntRange nextItem -> d
     com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence this$0 -> f
@@ -54410,7 +54771,7 @@
     9:9:java.lang.Object next():1079 -> next
     10:10:com.android.tools.r8.jetbrains.kotlin.ranges.IntRange com.android.tools.r8.jetbrains.kotlin.text.DelimitedRangesSequence$iterator$1.next():1114:1114 -> next
     10:10:java.lang.Object next():1079 -> next
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.sz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt -> com.android.tools.r8.internal.Lz:
     1:62:void com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderKt.appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0:61 -> a
     1:62:void appendElement(java.lang.Appendable,java.lang.Object,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):0 -> a
     63:63:boolean com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.contains(java.lang.CharSequence,char,boolean):0:0 -> a
@@ -54490,15 +54851,15 @@
     8231:8812:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):840:1421 -> a
     8813:8814:boolean com.android.tools.r8.jetbrains.kotlin.text.CharsKt__CharKt.equals(char,char,boolean):35:36 -> a
     8813:8814:int com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.indexOfAny(java.lang.CharSequence,char[],int,boolean):842 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.tz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__RegexExtensionsJVMKt -> com.android.tools.r8.internal.Mz:
 # {"id":"sourceFile","fileName":"RegexExtensionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.uz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringBuilderJVMKt -> com.android.tools.r8.internal.Nz:
 # {"id":"sourceFile","fileName":"StringBuilderJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.vz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringNumberConversionsJVMKt -> com.android.tools.r8.internal.Oz:
 # {"id":"sourceFile","fileName":"StringNumberConversionsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.internal.wz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsJVMKt -> com.android.tools.r8.internal.Pz:
 # {"id":"sourceFile","fileName":"StringsJVM.kt"}
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.xz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2 -> com.android.tools.r8.internal.Qz:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     char[] $delimiters -> a
     boolean $ignoreCase -> b
@@ -54507,7 +54868,7 @@
     1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.TuplesKt.to(java.lang.Object,java.lang.Object):43:43 -> a
     1146:1146:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$rangesDelimitedBy$2.invoke(java.lang.CharSequence,int):1144 -> a
     1146:1146:java.lang.Object invoke(java.lang.Object,java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.internal.yz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2 -> com.android.tools.r8.internal.Rz:
 # {"id":"sourceFile","fileName":"Strings.kt"}
     java.lang.CharSequence $this_splitToSequence -> a
     1:1219:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):0:1218 -> a
@@ -54529,9 +54890,9 @@
     1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt.substring(java.lang.CharSequence,com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):361:361 -> a
     1224:1224:java.lang.String com.android.tools.r8.jetbrains.kotlin.text.StringsKt__StringsKt$splitToSequence$2.invoke(com.android.tools.r8.jetbrains.kotlin.ranges.IntRange):1218 -> a
     1224:1224:java.lang.Object invoke(java.lang.Object):0 -> a
-com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.internal.zz:
+com.android.tools.r8.jetbrains.kotlin.text.StringsKt___StringsJvmKt -> com.android.tools.r8.internal.Sz:
 # {"id":"sourceFile","fileName":"_StringsJvm.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.Ta:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag -> com.android.tools.r8.internal.cb:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     int bitWidth -> b
     int value -> c
@@ -54542,34 +54903,34 @@
     3:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField):43:43 -> <init>
     1:1:boolean invoke(int):52:52 -> a
     1:1:int plus$kotlinx_metadata(int):46:46 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.Ta$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$Type -> com.android.tools.r8.internal.cb$a:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_NULLABLE -> a
     1:7:void <clinit>():424:430 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.Ta$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$TypeParameter -> com.android.tools.r8.internal.cb$b:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag IS_REIFIED -> a
     1:1:void <clinit>():441:441 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.Ta$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.Flag$ValueParameter -> com.android.tools.r8.internal.cb$c:
 # {"id":"sourceFile","fileName":"Flag.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.Flag DECLARES_DEFAULT_VALUE -> a
     1:13:void <clinit>():455:467 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.sd:
+com.android.tools.r8.jetbrains.kotlinx.metadata.InconsistentKotlinMetadataException -> com.android.tools.r8.internal.Ed:
 # {"id":"sourceFile","fileName":"InconsistentKotlinMetadataException.kt"}
     1:1:void <init>(java.lang.String,java.lang.Throwable):8:8 -> <init>
     2:2:void <init>(java.lang.String,java.lang.Throwable,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):8:8 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.vi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation -> com.android.tools.r8.internal.Ii:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.Map arguments -> b
     java.lang.String className -> a
     1:1:void <init>(java.lang.String,java.util.Map):18:18 -> <init>
     1:1:java.util.Map getArguments():18:18 -> a
     1:1:java.lang.String getClassName():18:18 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.wi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument -> com.android.tools.r8.internal.Ji:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     1:1:void <init>():25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.wi$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue -> com.android.tools.r8.internal.Ji$a:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation value -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):51:51 -> <init>
@@ -54583,12 +54944,12 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue.getValue():51:51 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.wi$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue -> com.android.tools.r8.internal.Ji$b:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.util.List value -> a
     1:1:void <init>(java.util.List):52:52 -> <init>
     1:1:java.util.List getValue():52:52 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.wi$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue -> com.android.tools.r8.internal.Ji$c:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     boolean value -> a
     1:1:void <init>(boolean):38:38 -> <init>
@@ -54605,7 +54966,7 @@
     1:1:java.lang.Boolean com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$BooleanValue.getValue():38:38 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.wi$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue -> com.android.tools.r8.internal.Ji$d:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):31:31 -> <init>
@@ -54622,7 +54983,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ByteValue.getValue():31:31 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.wi$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue -> com.android.tools.r8.internal.Ji$e:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     char value -> a
     1:1:void <init>(char):32:32 -> <init>
@@ -54639,7 +55000,7 @@
     1:1:java.lang.Character com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$CharValue.getValue():32:32 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.wi$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue -> com.android.tools.r8.internal.Ji$f:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     double value -> a
     1:1:void <init>(double):37:37 -> <init>
@@ -54656,14 +55017,14 @@
     1:1:java.lang.Double com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$DoubleValue.getValue():37:37 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.wi$g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue -> com.android.tools.r8.internal.Ji$g:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String enumClassName -> a
     java.lang.String enumEntryName -> b
     1:2:void <init>(java.lang.String,java.lang.String):47:48 -> <init>
     1:1:java.lang.String getEnumClassName():47:47 -> a
     1:1:java.lang.String getEnumEntryName():47:47 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.wi$h:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue -> com.android.tools.r8.internal.Ji$h:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     float value -> a
     1:1:void <init>(float):36:36 -> <init>
@@ -54680,7 +55041,7 @@
     1:1:java.lang.Float com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$FloatValue.getValue():36:36 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.wi$i:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue -> com.android.tools.r8.internal.Ji$i:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):34:34 -> <init>
@@ -54697,7 +55058,7 @@
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$IntValue.getValue():34:34 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.wi$j:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue -> com.android.tools.r8.internal.Ji$j:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
@@ -54711,7 +55072,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue.getValue():46:46 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.wi$k:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue -> com.android.tools.r8.internal.Ji$k:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):35:35 -> <init>
@@ -54728,7 +55089,7 @@
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$LongValue.getValue():35:35 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.wi$l:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue -> com.android.tools.r8.internal.Ji$l:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):33:33 -> <init>
@@ -54745,7 +55106,7 @@
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ShortValue.getValue():33:33 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.wi$m:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue -> com.android.tools.r8.internal.Ji$m:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     java.lang.String value -> a
     1:1:void <init>(java.lang.String):45:45 -> <init>
@@ -54759,7 +55120,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$StringValue.getValue():45:45 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.wi$n:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue -> com.android.tools.r8.internal.Ji$n:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     byte value -> a
     1:1:void <init>(byte):40:40 -> <init>
@@ -54776,7 +55137,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UByteValue.getValue():40:40 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.wi$o:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue -> com.android.tools.r8.internal.Ji$o:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     int value -> a
     1:1:void <init>(int):42:42 -> <init>
@@ -54793,7 +55154,7 @@
     1:1:java.lang.Integer com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UIntValue.getValue():42:42 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.wi$p:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue -> com.android.tools.r8.internal.Ji$p:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     long value -> a
     1:1:void <init>(long):43:43 -> <init>
@@ -54810,7 +55171,7 @@
     1:1:java.lang.Long com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ULongValue.getValue():43:43 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.wi$q:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue -> com.android.tools.r8.internal.Ji$q:
 # {"id":"sourceFile","fileName":"annotations.kt"}
     short value -> a
     1:1:void <init>(short):41:41 -> <init>
@@ -54827,7 +55188,7 @@
     1:1:java.lang.Short com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$UShortValue.getValue():41:41 -> toString
     1:1:java.lang.String toString():0 -> toString
     2:2:java.lang.String toString():0:0 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.xi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass -> com.android.tools.r8.internal.Ki:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List extensions -> o
     java.lang.String companionObject -> j
@@ -54906,9 +55267,9 @@
     1:1:java.util.List getSupertypes():54:54 -> n
     1:1:java.util.List getTypeParameters():49:49 -> o
     1:1:java.util.List getVersionRequirements():99:99 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.zi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor -> com.android.tools.r8.internal.Mi:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.Ai:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor -> com.android.tools.r8.internal.Ni:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):57:57 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):57:57 -> <init>
@@ -54925,31 +55286,31 @@
     1:1:void visitEnd():153 -> e
     2:2:void visitEnd():153:153 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.Bi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier -> com.android.tools.r8.internal.Oi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     1:1:void <init>():898:898 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):898:898 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.Bi$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$Class -> com.android.tools.r8.internal.Oi$a:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):904:904 -> <init>
     1:1:java.lang.String getName():904:904 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.Bi$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeAlias -> com.android.tools.r8.internal.Oi$b:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.String name -> a
     1:1:void <init>(java.lang.String):919:919 -> <init>
     1:1:java.lang.String getName():919:919 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.Bi$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier$TypeParameter -> com.android.tools.r8.internal.Oi$c:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int id -> a
     1:1:void <init>(int):911:911 -> <init>
     1:1:int getId():911:911 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Ci:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstantValue -> com.android.tools.r8.internal.Pi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Object value -> a
     1:1:void <init>(java.lang.Object):968:968 -> <init>
     1:1:java.lang.Object getValue():968:968 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Di:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructor -> com.android.tools.r8.internal.Qi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List valueParameters -> b
     java.util.List extensions -> d
@@ -54969,9 +55330,9 @@
     1:1:int getFlags():248:248 -> c
     1:1:java.util.List getValueParameters():252:252 -> d
     1:1:java.util.List getVersionRequirements():257:257 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.Fi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor -> com.android.tools.r8.internal.Si:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Gi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor -> com.android.tools.r8.internal.Ti:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorVisitor):210:210 -> <init>
@@ -54980,7 +55341,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor visitValueParameter(int,java.lang.String) -> a
     1:1:void visitEnd():238:238 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Hi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContract -> com.android.tools.r8.internal.Ui:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List effects -> b
     1:5:void <init>():758:762 -> <init>
@@ -54988,19 +55349,19 @@
     2:205:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):773:773 -> a
     206:206:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):774:774 -> a
     1:1:java.util.List getEffects():762:762 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Ii:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor -> com.android.tools.r8.internal.Vi:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor):663:663 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmContractVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):663:663 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):672:672 -> a
     2:2:void visitEnd():678:678 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Ji:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer -> com.android.tools.r8.internal.Wi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List getProperties() -> a
     java.util.List getTypeAliases() -> b
     java.util.List getFunctions() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Ki:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor -> com.android.tools.r8.internal.Xi:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor):11:11 -> <init>
@@ -55008,7 +55369,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitProperty(int,java.lang.String,int,int) -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String) -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainerVisitor getDelegate():11:11 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Li:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffect -> com.android.tools.r8.internal.Yi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List constructorArguments -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression conclusion -> c
@@ -55023,7 +55384,7 @@
     1:1:java.util.List getConstructorArguments():796:796 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind getInvocationKind():790:790 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType getType():789:789 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Mi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression -> com.android.tools.r8.internal.Zi:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer parameterIndex -> c
     java.util.List andArguments -> f
@@ -55046,7 +55407,7 @@
     1:1:java.util.List getOrArguments():859:859 -> g
     1:1:java.lang.Integer getParameterIndex():837:837 -> h
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType isInstanceType():847:847 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.Ni:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor -> com.android.tools.r8.internal.aj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor):722:722 -> <init>
@@ -55057,21 +55418,21 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitAndArgument():756:756 -> a
     1:1:void visitEnd():769:769 -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.Oi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind -> com.android.tools.r8.internal.bj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind EXACTLY_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_MOST_ONCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind AT_LEAST_ONCE -> c
     1:1:void <init>(java.lang.String,int):812:812 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.Pi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType -> com.android.tools.r8.internal.cj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType CALLS -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_CONSTANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType RETURNS_NOT_NULL -> c
     1:1:void <init>(java.lang.String,int):800:800 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.Qi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor -> com.android.tools.r8.internal.dj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor):691:691 -> <init>
@@ -55079,7 +55440,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConclusionOfConditionalEffect():704:704 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitConstructorArgument():697:697 -> b
     1:1:void visitEnd():710:710 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.Si:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType -> com.android.tools.r8.internal.fj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KClass klass -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):31:31 -> <init>
@@ -55093,16 +55454,16 @@
     31:31:java.lang.String toString():39:39 -> toString
     32:32:java.lang.Class com.android.tools.r8.jetbrains.kotlin.jvm.JvmClassMappingKt.getJavaClass(com.android.tools.r8.jetbrains.kotlin.reflect.KClass):28:28 -> toString
     32:32:java.lang.String toString():39 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.Ti:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor -> com.android.tools.r8.internal.gj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.Ui:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound -> com.android.tools.r8.internal.hj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> a
     java.lang.String typeFlexibilityId -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType,java.lang.String):947:947 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():947:947 -> a
     1:1:java.lang.String getTypeFlexibilityId():947:947 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.Vi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction -> com.android.tools.r8.internal.ij:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     java.util.List versionRequirements -> f
@@ -55139,9 +55500,9 @@
     1:1:java.util.List getTypeParameters():297:297 -> i
     1:1:java.util.List getValueParameters():307:307 -> j
     1:1:java.util.List getVersionRequirements():317:317 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.Xi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor -> com.android.tools.r8.internal.kj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.Yi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor -> com.android.tools.r8.internal.lj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor):248:248 -> <init>
@@ -55154,19 +55515,19 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):284:284 -> b
     2:2:void visitEnd():310:310 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():290:290 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.Zi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda -> com.android.tools.r8.internal.mj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction function -> b
     1:1:void <init>():223:223 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):230:230 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.aj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor -> com.android.tools.r8.internal.nj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):187:187 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):187:187 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):195:195 -> a
     2:2:void visitEnd():201:201 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.bj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage -> com.android.tools.r8.internal.oj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List functions -> b
     java.util.List extensions -> e
@@ -55206,9 +55567,9 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor visitTypeAlias(int,java.lang.String):201:201 -> b
     1:1:java.util.List getFunctions():179:179 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.dj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor -> com.android.tools.r8.internal.qj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.ej:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor -> com.android.tools.r8.internal.rj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):162:162 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):162:162 -> <init>
@@ -55216,7 +55577,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor.getDelegate():164:164 -> e
     1:1:void visitEnd():178 -> e
     2:2:void visitEnd():178:178 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.fj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty -> com.android.tools.r8.internal.sj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter setterParameter -> d
@@ -55253,9 +55614,9 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter getSetterParameter():394:394 -> i
     1:1:java.util.List getTypeParameters():384:384 -> j
     1:1:java.util.List getVersionRequirements():404:404 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.hj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor -> com.android.tools.r8.internal.uj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.ij:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor -> com.android.tools.r8.internal.vj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor):320:320 -> <init>
@@ -55267,7 +55628,7 @@
     5:5:void visitEnd():376:376 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitReturnType(int):356:356 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():362:362 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.jj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmType -> com.android.tools.r8.internal.wj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound flexibleTypeUpperBound -> f
     int flags -> h
@@ -55305,7 +55666,7 @@
     1:1:int getFlags():594:594 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFlexibleTypeUpperBound getFlexibleTypeUpperBound():633:633 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getOuterType():626:626 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.kj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAlias -> com.android.tools.r8.internal.xj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List typeParameters -> b
     java.lang.String name -> h
@@ -55331,7 +55692,7 @@
     1:1:java.lang.String getName():451:451 -> e
     1:1:java.util.List getTypeParameters():456:456 -> f
     1:1:java.util.List getVersionRequirements():477:477 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.lj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor -> com.android.tools.r8.internal.yj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor):386:386 -> <init>
@@ -55342,9 +55703,9 @@
     4:4:void visitEnd():435:435 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUnderlyingType(int):405:405 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.nj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor -> com.android.tools.r8.internal.Aj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.oj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameter -> com.android.tools.r8.internal.Bj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.util.List upperBounds -> b
     java.util.List extensions -> c
@@ -55366,9 +55727,9 @@
     1:1:java.lang.String getName():559:559 -> d
     1:1:java.util.List getUpperBounds():566:566 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():561:561 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.qj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Dj:
 # {"id":"sourceFile","fileName":"extensions.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.rj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor -> com.android.tools.r8.internal.Ej:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor):475:475 -> <init>
@@ -55376,7 +55737,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):482:482 -> a
     2:2:void visitEnd():496:496 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.sj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection -> com.android.tools.r8.internal.Fj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeProjection STAR -> a
@@ -55387,7 +55748,7 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType component2() -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():929:929 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance getVariance():929:929 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.tj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor -> com.android.tools.r8.internal.Gj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor):511:511 -> <init>
@@ -55402,7 +55763,7 @@
     2:2:void visitStarProjection():555:555 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):585:585 -> b
     1:1:void visitTypeParameter(int):537:537 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.uj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameter -> com.android.tools.r8.internal.Hj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmType varargElementType -> c
@@ -55416,7 +55777,7 @@
     1:1:java.lang.String getName():518:518 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getType():523:523 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmType getVarargElementType():528:528 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.vj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor -> com.android.tools.r8.internal.Ij:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor):445:445 -> <init>
@@ -55424,13 +55785,13 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitType(int):452:452 -> a
     2:2:void visitEnd():466:466 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):460:460 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.wj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance -> com.android.tools.r8.internal.Jj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance IN -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance INVARIANT -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance OUT -> c
     1:1:void <init>(java.lang.String,int):777:777 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.xj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion -> com.android.tools.r8.internal.Kj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     int minor -> b
     int patch -> c
@@ -55440,7 +55801,7 @@
     1:1:int getMinor():956:956 -> b
     1:1:int getPatch():956:956 -> c
     1:1:java.lang.String toString():957:957 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.yj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement -> com.android.tools.r8.internal.Lj:
 # {"id":"sourceFile","fileName":"nodes.kt"}
     java.lang.Integer errorCode -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
@@ -55455,21 +55816,21 @@
     10:10:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):746:746 -> a
     1:1:java.lang.Integer getErrorCode():717:717 -> b
     1:1:java.lang.String getMessage():722:722 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.zj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel -> com.android.tools.r8.internal.Mj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel ERROR -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel WARNING -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):821:821 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.Aj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind -> com.android.tools.r8.internal.Nj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind API_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind LANGUAGE_VERSION -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind COMPILER_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind[] $VALUES -> d
     1:1:void <init>(java.lang.String,int):830:830 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.Bj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor -> com.android.tools.r8.internal.Oj:
 # {"id":"sourceFile","fileName":"visitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):622:622 -> <init>
@@ -55477,7 +55838,7 @@
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel,java.lang.Integer,java.lang.String) -> a
     void visitVersion(int,int,int) -> a
     1:1:void visitEnd():651:651 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.o6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter -> com.android.tools.r8.internal.s6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):396:398 -> <init>
@@ -55515,63 +55876,63 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():444 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():398:398 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder getT():397:397 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.g6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1 -> com.android.tools.r8.internal.k6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:416:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitConstructor$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder):0:414 -> a
     2:416:java.lang.Object invoke(java.lang.Object):396 -> a
     417:417:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.h6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1 -> com.android.tools.r8.internal.l6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:450:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:448 -> a
     2:450:java.lang.Object invoke(java.lang.Object):396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.i6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1 -> com.android.tools.r8.internal.m6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:419:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:417 -> a
     2:419:java.lang.Object invoke(java.lang.Object):396 -> a
     420:420:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.j6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1 -> com.android.tools.r8.internal.n6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:422:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:420 -> a
     2:422:java.lang.Object invoke(java.lang.Object):396 -> a
     423:423:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.k6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1 -> com.android.tools.r8.internal.o6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:413:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitSupertype$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:411 -> a
     2:413:java.lang.Object invoke(java.lang.Object):396 -> a
     414:414:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.l6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.p6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:425:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:423 -> a
     2:425:java.lang.Object invoke(java.lang.Object):396 -> a
     426:426:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.m6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1 -> com.android.tools.r8.internal.q6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:410:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:408 -> a
     2:410:java.lang.Object invoke(java.lang.Object):396 -> a
     411:411:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.n6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1 -> com.android.tools.r8.internal.r6:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):396:396 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ClassWriter$visitVersionRequirement$1.invoke(int):444:444 -> a
     2:2:java.lang.Object invoke(java.lang.Object):396 -> a
     3:3:java.lang.Object invoke(java.lang.Object):396:396 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.Pl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter -> com.android.tools.r8.internal.cm:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):483:485 -> <init>
@@ -55582,14 +55943,14 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor visitFunction(int,java.lang.String):488 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():485:485 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():484:484 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.Ol:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1 -> com.android.tools.r8.internal.bm:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):483:483 -> a
     2:490:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.LambdaWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:488 -> a
     2:490:java.lang.Object invoke(java.lang.Object):483 -> a
     491:491:java.lang.Object invoke(java.lang.Object):483:483 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.ks:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter -> com.android.tools.r8.internal.ws:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder t -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable):458:460 -> <init>
@@ -55606,35 +55967,35 @@
     1:2:void visitEnd():477:478 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext getC():460:460 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder getT():459:459 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.gs:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1 -> com.android.tools.r8.internal.ss:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:475:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:473 -> a
     2:475:java.lang.Object invoke(java.lang.Object):458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.hs:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1 -> com.android.tools.r8.internal.ts:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:465:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitFunction$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder):0:463 -> a
     2:465:java.lang.Object invoke(java.lang.Object):458 -> a
     466:466:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.is:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1 -> com.android.tools.r8.internal.us:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:468:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:466 -> a
     2:468:java.lang.Object invoke(java.lang.Object):458 -> a
     469:469:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.js:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1 -> com.android.tools.r8.internal.vs:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):458:458 -> a
     2:471:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.PackageWriter$visitTypeAlias$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder):0:469 -> a
     2:471:java.lang.Object invoke(java.lang.Object):458 -> a
     472:472:java.lang.Object invoke(java.lang.Object):458:458 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.zv:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadContext -> com.android.tools.r8.internal.Uv:
 # {"id":"sourceFile","fileName":"readers.kt"}
     java.util.List extensions -> a
     java.util.Map typeParameterNameToId -> b
@@ -55651,7 +56012,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable getTypes():16:16 -> c
     2:2:java.lang.Integer getTypeParameterId(int):30:30 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable getVersionRequirements$kotlinx_metadata():17:17 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.Av:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadUtilsKt -> com.android.tools.r8.internal.Vv:
 # {"id":"sourceFile","fileName":"readUtils.kt"}
     1:1:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.ClassNameKt.isLocal(java.lang.String):0:0 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteUtilsKt.getClassNameIndex(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable,java.lang.String):109 -> a
@@ -55954,7 +56315,7 @@
     4838:4838:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertyGetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):426:426 -> a
     4839:4839:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getDefaultPropertyAccessorFlags(int):432:432 -> a
     1:1:int com.android.tools.r8.jetbrains.kotlinx.metadata.impl.ReadersKt.getPropertySetterFlags(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property):429:429 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.fD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext -> com.android.tools.r8.internal.VD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable versionRequirements -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.StringTable strings -> b
@@ -55963,7 +56324,7 @@
     2:2:int get(java.lang.String):19:19 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable getVersionRequirements():16:16 -> b
     2:2:int getClassName(java.lang.String):22:22 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 -> com.android.tools.r8.internal.ZD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder t -> b
@@ -55981,28 +56342,28 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():129 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder getT():123:123 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.gD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1 -> com.android.tools.r8.internal.WD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:135:com.android.tools.r8.jetbrains.kotlinx.metadata.KmConstructorExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:133 -> a
     2:135:java.lang.Object invoke(java.lang.Object):122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.hD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1 -> com.android.tools.r8.internal.XD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:128:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:126 -> a
     2:128:java.lang.Object invoke(java.lang.Object):122 -> a
     129:129:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.iD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.YD:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):122:122 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeConstructor$1$visitVersionRequirement$1.invoke(int):129:129 -> a
     2:2:java.lang.Object invoke(java.lang.Object):122 -> a
     3:3:java.lang.Object invoke(java.lang.Object):122:122 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.lD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 -> com.android.tools.r8.internal.bE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder t -> b
@@ -56014,14 +56375,14 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor visitEffect(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind):324 -> a
     3:3:void visitEnd():327:327 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder getT():321:321 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.kD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1 -> com.android.tools.r8.internal.aE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):320:320 -> a
     2:326:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeContract$1$visitEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder):0:324 -> a
     2:326:java.lang.Object invoke(java.lang.Object):320 -> a
     327:327:java.lang.Object invoke(java.lang.Object):320:320 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.oD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 -> com.android.tools.r8.internal.eE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder t -> b
@@ -56043,21 +56404,21 @@
     15:15:void visitEnd():352:352 -> c
     16:21:void visitEnd():351:356 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder getT():335:335 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.mD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1 -> com.android.tools.r8.internal.cE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
     2:343:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConclusionOfConditionalEffect$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:341 -> a
     2:343:java.lang.Object invoke(java.lang.Object):334 -> a
     344:344:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.nD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1 -> com.android.tools.r8.internal.dE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):334:334 -> a
     2:340:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffect$1$visitConstructorArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:338 -> a
     2:340:java.lang.Object invoke(java.lang.Object):334 -> a
     341:341:java.lang.Object invoke(java.lang.Object):334:334 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.sD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 -> com.android.tools.r8.internal.iE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder t -> b
@@ -56079,28 +56440,28 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeEffectExpression(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpressionVisitor visitOrArgument():389 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder getT():362:362 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.pD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1 -> com.android.tools.r8.internal.fE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:388:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitAndArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:386 -> a
     2:388:java.lang.Object invoke(java.lang.Object):361 -> a
     389:389:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.qD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1 -> com.android.tools.r8.internal.gE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:385:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitIsInstanceType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:383 -> a
     2:385:java.lang.Object invoke(java.lang.Object):361 -> a
     386:386:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.rD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1 -> com.android.tools.r8.internal.hE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):361:361 -> a
     2:391:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeEffectExpression$1$visitOrArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder):0:389 -> a
     2:391:java.lang.Object invoke(java.lang.Object):361 -> a
     392:392:java.lang.Object invoke(java.lang.Object):361:361 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.AD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 -> com.android.tools.r8.internal.qE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder t -> b
     int $flags -> e
@@ -56135,7 +56496,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():161 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder getT():146:146 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.tD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1 -> com.android.tools.r8.internal.jE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
@@ -56154,49 +56515,49 @@
     172:172:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder.build():23586:23586 -> a
     172:172:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitContract$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder):164 -> a
     172:172:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1 -> com.android.tools.r8.internal.kE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:170:com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:168 -> a
     2:170:java.lang.Object invoke(java.lang.Object):145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.vD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.lE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:154:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:152 -> a
     2:154:java.lang.Object invoke(java.lang.Object):145 -> a
     155:155:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.wD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1 -> com.android.tools.r8.internal.mE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:160:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:158 -> a
     2:160:java.lang.Object invoke(java.lang.Object):145 -> a
     161:161:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.xD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1 -> com.android.tools.r8.internal.nE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:151:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:149 -> a
     2:151:java.lang.Object invoke(java.lang.Object):145 -> a
     152:152:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.yD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1 -> com.android.tools.r8.internal.oE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:157:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitValueParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:155 -> a
     2:157:java.lang.Object invoke(java.lang.Object):145 -> a
     158:158:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.zD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.pE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):145:145 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeFunction$1$visitVersionRequirement$1.invoke(int):161:161 -> a
     2:2:java.lang.Object invoke(java.lang.Object):145 -> a
     3:3:java.lang.Object invoke(java.lang.Object):145:145 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.HD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 -> com.android.tools.r8.internal.xE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder t -> b
     int $getterFlags -> f
@@ -56229,49 +56590,49 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():198 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder getT():183:183 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.BD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1 -> com.android.tools.r8.internal.rE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:204:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:202 -> a
     2:204:java.lang.Object invoke(java.lang.Object):182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.CD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1 -> com.android.tools.r8.internal.sE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:191:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReceiverParameterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:189 -> a
     2:191:java.lang.Object invoke(java.lang.Object):182 -> a
     192:192:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.DD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1 -> com.android.tools.r8.internal.tE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:197:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitReturnType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:195 -> a
     2:197:java.lang.Object invoke(java.lang.Object):182 -> a
     198:198:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.ED:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1 -> com.android.tools.r8.internal.uE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:194:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitSetterParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder):0:192 -> a
     2:194:java.lang.Object invoke(java.lang.Object):182 -> a
     195:195:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.FD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1 -> com.android.tools.r8.internal.vE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:188:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:186 -> a
     2:188:java.lang.Object invoke(java.lang.Object):182 -> a
     189:189:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.GD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.wE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):182:182 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeProperty$1$visitVersionRequirement$1.invoke(int):198:198 -> a
     2:2:java.lang.Object invoke(java.lang.Object):182 -> a
     3:3:java.lang.Object invoke(java.lang.Object):182:182 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.ND:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 -> com.android.tools.r8.internal.DE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder t -> b
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> e
@@ -56301,14 +56662,14 @@
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitOuterType(int):94 -> b
     1:1:void visitTypeParameter(int):87:87 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.ID:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1 -> com.android.tools.r8.internal.yE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:93:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitAbbreviatedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:91 -> a
     2:93:java.lang.Object invoke(java.lang.Object):57 -> a
     94:94:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.JD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1 -> com.android.tools.r8.internal.zE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance $variance -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
@@ -56318,14 +56679,14 @@
     85:85:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitArgument$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):76:76 -> a
     85:85:java.lang.Object invoke(java.lang.Object):57 -> a
     86:86:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.KD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1 -> com.android.tools.r8.internal.AE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:108:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:106 -> a
     2:108:java.lang.Object invoke(java.lang.Object):57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.LD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1 -> com.android.tools.r8.internal.BE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     java.lang.String $typeFlexibilityId -> b
@@ -56333,14 +56694,14 @@
     2:103:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitFlexibleTypeUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:101 -> a
     2:103:java.lang.Object invoke(java.lang.Object):57 -> a
     104:104:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.MD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1 -> com.android.tools.r8.internal.CE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):57:57 -> a
     2:96:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeType$1$visitOuterType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:94 -> a
     2:96:java.lang.Object invoke(java.lang.Object):57 -> a
     97:97:java.lang.Object invoke(java.lang.Object):57:57 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.SD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 -> com.android.tools.r8.internal.IE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder t -> b
     int $flags -> d
@@ -56367,35 +56728,35 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeVersionRequirement(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor visitVersionRequirement():258 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder getT():242:242 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.OD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1 -> com.android.tools.r8.internal.EE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:253:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitExpandedType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:251 -> a
     2:253:java.lang.Object invoke(java.lang.Object):241 -> a
     254:254:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.PD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1 -> com.android.tools.r8.internal.FE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:247:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitTypeParameter$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder):0:245 -> a
     2:247:java.lang.Object invoke(java.lang.Object):241 -> a
     248:248:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.QD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1 -> com.android.tools.r8.internal.GE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:250:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitUnderlyingType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:248 -> a
     2:250:java.lang.Object invoke(java.lang.Object):241 -> a
     251:251:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.RD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1 -> com.android.tools.r8.internal.HE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):241:241 -> a
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeAlias$1$visitVersionRequirement$1.invoke(int):258:258 -> a
     2:2:java.lang.Object invoke(java.lang.Object):241 -> a
     3:3:java.lang.Object invoke(java.lang.Object):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.VD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 -> com.android.tools.r8.internal.LE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder t -> b
     int $flags -> f
@@ -56412,21 +56773,21 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitUpperBound(int):33 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):36:36 -> a
     5:16:void visitEnd():41:52 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.TD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1 -> com.android.tools.r8.internal.JE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType $type -> b
     1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
     2:39:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterExtensionVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitExtensions$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions):0:37 -> a
     2:39:java.lang.Object invoke(java.lang.Object):29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.UD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1 -> com.android.tools.r8.internal.KE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):29:29 -> a
     2:35:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeTypeParameter$1$visitUpperBound$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:33 -> a
     2:35:java.lang.Object invoke(java.lang.Object):29 -> a
     36:36:java.lang.Object invoke(java.lang.Object):29:29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.YD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 -> com.android.tools.r8.internal.OE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder t -> b
     int $flags -> d
@@ -56444,21 +56805,21 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):57:57 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt.access$writeType(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,int,com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1):1 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor visitVarargElementType(int):227 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.WD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1 -> com.android.tools.r8.internal.ME:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
     2:226:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:224 -> a
     2:226:java.lang.Object invoke(java.lang.Object):220 -> a
     227:227:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.XD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1 -> com.android.tools.r8.internal.NE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):220:220 -> a
     2:229:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeValueParameter$1$visitVarargElementType$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder):0:227 -> a
     2:229:java.lang.Object invoke(java.lang.Object):220 -> a
     230:230:java.lang.Object invoke(java.lang.Object):220:220 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.bE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 -> com.android.tools.r8.internal.RE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlin.jvm.functions.Function1 $output -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder t -> b
@@ -56482,7 +56843,7 @@
     36:39:void visitEnd():312:315 -> a
     40:40:void visitEnd():313:313 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder getT():272:272 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.ZD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1 -> com.android.tools.r8.internal.PE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
@@ -56491,7 +56852,7 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$1.invoke(int):306:306 -> a
     4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.aE:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2 -> com.android.tools.r8.internal.QE:
 # {"id":"sourceFile","fileName":"writers.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):271:271 -> a
@@ -56500,26 +56861,26 @@
     3:3:java.lang.Object invoke(java.lang.Object):271:271 -> a
     4:4:void com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WritersKt$writeVersionRequirement$1$visitVersion$2.invoke(int):307:307 -> a
     4:4:java.lang.Object invoke(java.lang.Object):271 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.yi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmClassExtension -> com.android.tools.r8.internal.Li:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Ei:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmConstructorExtension -> com.android.tools.r8.internal.Ri:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.Ri:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmExtension -> com.android.tools.r8.internal.ej:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.Wi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmFunctionExtension -> com.android.tools.r8.internal.jj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.cj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPackageExtension -> com.android.tools.r8.internal.pj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.gj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension -> com.android.tools.r8.internal.tj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.mj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension -> com.android.tools.r8.internal.zj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.pj:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension -> com.android.tools.r8.internal.Cj:
 # {"id":"sourceFile","fileName":"extensionNodes.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.po:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions -> com.android.tools.r8.internal.Bo:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion Companion -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.oo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion -> com.android.tools.r8.internal.Ao:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlin.Lazy INSTANCES$delegate -> b
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> a
@@ -56527,13 +56888,13 @@
     1:2:void <clinit>():61:62 -> <clinit>
     1:1:void <init>():61:61 -> <init>
     java.util.List getINSTANCES() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.no:
+com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 -> com.android.tools.r8.internal.zo:
 # {"id":"sourceFile","fileName":"MetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2 INSTANCE -> a
     1:2:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.MetadataExtensions$Companion$INSTANCES$2.invoke():63:64 -> a
     1:2:java.lang.Object invoke():61 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.Ct:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.Mt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$1 -> com.android.tools.r8.internal.Xt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation -> com.android.tools.r8.internal.hu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation defaultInstance -> a
     java.util.List argument_ -> f
     int memoizedSerializedSize -> h
@@ -56592,11 +56953,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation):4327:4327 -> m
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder toBuilder():4329 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.Dt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1 -> com.android.tools.r8.internal.Yt:
     1:1:void <init>():1957:1957 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1962:1962 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):1957 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.Kt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument -> com.android.tools.r8.internal.fu:
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int bitField0_ -> d
@@ -56648,11 +57009,11 @@
     1:1:boolean hasValue():3813:3813 -> k
     1:2:void initFields():3823:3824 -> l
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder newBuilder():3939:3939 -> m
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.Et:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1 -> com.android.tools.r8.internal.Zt:
     1:1:void <init>():2080:2080 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2085:2085 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2080 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.Ft:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder -> com.android.tools.r8.internal.au:
     int bitField0_ -> b
     int nameId_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value value_ -> d
@@ -56695,7 +57056,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder.create():3963:3963 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Builder access$3600():3949 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument buildPartial():3992:4003 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.Jt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value -> com.android.tools.r8.internal.eu:
     int arrayDimensionCount_ -> n
     int flags_ -> o
     long intValue_ -> f
@@ -56811,11 +57172,11 @@
     1:1:boolean hasFlags():2793:2793 -> x
     1:1:boolean hasFloatValue():2617:2617 -> y
     1:1:boolean hasIntValue():2602:2602 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.Gt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1 -> com.android.tools.r8.internal.bu:
     1:1:void <init>():2399:2399 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2404:2404 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2399 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.Ht:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Builder -> com.android.tools.r8.internal.cu:
     int arrayDimensionCount_ -> l
     int flags_ -> m
     int classId_ -> h
@@ -56886,7 +57247,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value build():3060:3060 -> g
     1:49:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value buildPartial():3066:3114 -> h
     1:3:void ensureArrayElementIsMutable():3530:3532 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.It:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type -> com.android.tools.r8.internal.du:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type[] $VALUES -> n
     int value -> o
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type BYTE -> a
@@ -56919,7 +57280,7 @@
     11:11:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2532:2532 -> b
     12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2531:2531 -> b
     13:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Argument$Value$Type valueOf(int):2530:2530 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.Lt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation$Builder -> com.android.tools.r8.internal.gu:
     java.util.List argument_ -> d
     int bitField0_ -> b
     int id_ -> c
@@ -56957,7 +57318,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation build():4371:4371 -> g
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Annotation buildPartial():4377:4389 -> h
     1:3:void ensureArgumentIsMutable():4481:4483 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.Qt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class -> com.android.tools.r8.internal.lu:
     int nestedClassNameMemoizedSerializedSize -> n
     java.util.List typeAlias_ -> r
     byte memoizedIsInitialized -> y
@@ -57144,11 +57505,11 @@
     1:1:java.util.List getTypeParameterList():8977:8977 -> x
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable getTypeTable():9297:9297 -> y
     1:1:java.util.List getVersionRequirementList():9311:9311 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.Nt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1 -> com.android.tools.r8.internal.iu:
     1:1:void <init>():8778:8778 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8783:8783 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):8778 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.Ot:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder -> com.android.tools.r8.internal.ju:
     java.util.List sealedSubclassFqName_ -> q
     java.util.List enumEntry_ -> p
     java.util.List typeAlias_ -> o
@@ -57266,7 +57627,7 @@
     1:3:void ensureTypeAliasIsMutable():10952:10954 -> p
     1:3:void ensureTypeParameterIsMutable():10195:10197 -> q
     1:3:void ensureVersionRequirementIsMutable():11327:11329 -> r
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.Pt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind -> com.android.tools.r8.internal.ku:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind INTERFACE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind CLASS -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind ENUM_ENTRY -> d
@@ -57281,7 +57642,7 @@
     1:2:void <init>(java.lang.String,int,int,int):8894:8895 -> <init>
     1:1:int getNumber():8865:8865 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Kind[] values():8795:8795 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.Tt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor -> com.android.tools.r8.internal.ou:
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     int memoizedSerializedSize -> j
@@ -57343,11 +57704,11 @@
     1:1:boolean hasFlags():13501:13501 -> o
     1:3:void initFields():13586:13588 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder newBuilder():13718:13718 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.Rt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1 -> com.android.tools.r8.internal.mu:
     1:1:void <init>():13474:13474 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13479:13479 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):13474 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.St:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder -> com.android.tools.r8.internal.nu:
     java.util.List valueParameter_ -> f
     int bitField0_ -> d
     int flags_ -> e
@@ -57384,7 +57745,7 @@
     1:18:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor buildPartial():13772:13789 -> h
     1:3:void ensureValueParameterIsMutable():13916:13918 -> i
     1:3:void ensureVersionRequirementIsMutable():14040:14042 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.Wt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract -> com.android.tools.r8.internal.ru:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract defaultInstance -> a
     java.util.List effect_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
@@ -57433,11 +57794,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract):23544:23544 -> k
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder toBuilder():23546 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.Ut:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1 -> com.android.tools.r8.internal.pu:
     1:1:void <init>():23389:23389 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23394:23394 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23389 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.Vt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder -> com.android.tools.r8.internal.qu:
     java.util.List effect_ -> c
     int bitField0_ -> b
     1:91:void <init>():23558:23648 -> <init>
@@ -57472,7 +57833,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract$Builder access$22300():23551 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Contract buildPartial():23592:23598 -> g
     1:3:void ensureEffectIsMutable():23651:23653 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.bu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect -> com.android.tools.r8.internal.wu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect defaultInstance -> a
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> e
@@ -57536,11 +57897,11 @@
     1:1:boolean hasKind():24216:24216 -> n
     1:4:void initFields():24226:24229 -> o
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder newBuilder():24358:24358 -> p
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.Xt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1 -> com.android.tools.r8.internal.su:
     1:1:void <init>():23956:23956 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23961:23961 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):23956 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.Yt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder -> com.android.tools.r8.internal.tu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType effectType_ -> c
     java.util.List effectConstructorArgument_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression conclusionOfConditionalEffect_ -> e
@@ -57585,7 +57946,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$Builder access$22800():24368 -> f
     1:21:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect buildPartial():24415:24435 -> g
     1:3:void ensureEffectConstructorArgumentIsMutable():24538:24540 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.Zt:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType -> com.android.tools.r8.internal.uu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType RETURNS_NOT_NULL -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType[] $VALUES -> d
     int value -> e
@@ -57598,7 +57959,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24043:24043 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24042:24042 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$EffectType valueOf(int):24041:24041 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.au:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind -> com.android.tools.r8.internal.vu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_MOST_ONCE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind EXACTLY_ONCE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind AT_LEAST_ONCE -> c
@@ -57611,7 +57972,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24108:24108 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24107:24107 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Effect$InvocationKind valueOf(int):24106:24106 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.eu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry -> com.android.tools.r8.internal.zu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry defaultInstance -> b
     int memoizedSerializedSize -> h
@@ -57654,11 +58015,11 @@
     1:1:boolean hasName():20550:20550 -> m
     1:1:void initFields():20560:20560 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder newBuilder():20665:20665 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.cu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1 -> com.android.tools.r8.internal.xu:
     1:1:void <init>():20529:20529 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20534:20534 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):20529 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.du:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder -> com.android.tools.r8.internal.yu:
     int bitField0_ -> d
     int name_ -> e
     1:1:void <init>():20681:20681 -> <init>
@@ -57689,7 +58050,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder.create():20688:20688 -> g
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry$Builder access$19200():20675 -> g
     1:8:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$EnumEntry buildPartial():20715:20722 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.iu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression -> com.android.tools.r8.internal.Du:
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int isInstanceTypeId_ -> i
@@ -57776,11 +58137,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression):25556:25556 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder toBuilder():25558 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.fu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1 -> com.android.tools.r8.internal.Au:
     1:1:void <init>():25075:25075 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25080:25080 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):25075 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.gu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$Builder -> com.android.tools.r8.internal.Bu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue constantValue_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type isInstanceType_ -> f
     int isInstanceTypeId_ -> g
@@ -57838,7 +58199,7 @@
     1:34:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression buildPartial():25621:25654 -> h
     1:3:void ensureAndArgumentIsMutable():26005:26007 -> i
     1:3:void ensureOrArgumentIsMutable():26202:26204 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.hu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue -> com.android.tools.r8.internal.Cu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue FALSE -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue NULL -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue[] $VALUES -> d
@@ -57851,7 +58212,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25128:25128 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25127:25127 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Expression$ConstantValue valueOf(int):25126:25126 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.lu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function -> com.android.tools.r8.internal.Gu:
     java.util.List versionRequirement_ -> p
     int receiverTypeId_ -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -57978,11 +58339,11 @@
     1:1:boolean hasContract():14776:14776 -> x
     1:1:boolean hasFlags():14538:14538 -> y
     1:1:boolean hasName():14582:14582 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.ju:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1 -> com.android.tools.r8.internal.Eu:
     1:1:void <init>():14503:14503 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14508:14508 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):14503 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.ku:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder -> com.android.tools.r8.internal.Fu:
     int receiverTypeId_ -> l
     java.util.List versionRequirement_ -> o
     int returnTypeId_ -> i
@@ -58092,7 +58453,7 @@
     1:3:void ensureTypeParameterIsMutable():15533:15535 -> j
     1:3:void ensureValueParameterIsMutable():15750:15752 -> k
     1:3:void ensureVersionRequirementIsMutable():15934:15936 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.mu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind -> com.android.tools.r8.internal.Hu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind DELEGATION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] $VALUES -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind SYNTHESIZED -> d
@@ -58104,7 +58465,7 @@
     1:2:void <init>(java.lang.String,int,int,int):268:269 -> <init>
     1:1:int getNumber():242:242 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$MemberKind[] values():196:196 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.nu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality -> com.android.tools.r8.internal.Iu:
     int value -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality FINAL -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality SEALED -> d
@@ -58116,7 +58477,7 @@
     1:2:void <init>(java.lang.String,int,int,int):86:87 -> <init>
     1:1:int getNumber():60:60 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality[] values():14:14 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.qu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package -> com.android.tools.r8.internal.Lu:
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable typeTable_ -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> j
@@ -58197,11 +58558,11 @@
     1:1:boolean hasVersionRequirementTable():11825:11825 -> r
     1:5:void initFields():11835:11839 -> s
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder newBuilder():11996:11996 -> t
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.ou:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1 -> com.android.tools.r8.internal.Ju:
     1:1:void <init>():11684:11684 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11689:11689 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):11684 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.pu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder -> com.android.tools.r8.internal.Ku:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable versionRequirementTable_ -> i
     java.util.List property_ -> f
     java.util.List function_ -> e
@@ -58261,7 +58622,7 @@
     1:3:void ensureFunctionIsMutable():12182:12184 -> j
     1:3:void ensurePropertyIsMutable():12307:12309 -> k
     1:3:void ensureTypeAliasIsMutable():12432:12434 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.tu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property -> com.android.tools.r8.internal.Ou:
     int getterFlags_ -> o
     java.util.List versionRequirement_ -> q
     int receiverTypeId_ -> m
@@ -58378,11 +58739,11 @@
     1:1:boolean hasFlags():16503:16503 -> x
     1:1:boolean hasGetterFlags():16686:16686 -> y
     1:1:boolean hasName():16549:16549 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.ru:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1 -> com.android.tools.r8.internal.Mu:
     1:1:void <init>():16466:16466 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16471:16471 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):16466 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.su:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder -> com.android.tools.r8.internal.Nu:
     int getterFlags_ -> n
     int setterFlags_ -> o
     int receiverTypeId_ -> l
@@ -58486,7 +58847,7 @@
     1:54:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property buildPartial():17055:17108 -> i
     1:3:void ensureTypeParameterIsMutable():17480:17482 -> j
     1:3:void ensureVersionRequirementIsMutable():17868:17870 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.Au:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type -> com.android.tools.r8.internal.Vu:
     int typeAliasName_ -> n
     int typeParameter_ -> l
     int typeParameterName_ -> m
@@ -58617,11 +58978,11 @@
     1:1:int getTypeParameter():5807:5807 -> x
     1:1:int getTypeParameterName():5830:5830 -> y
     1:1:boolean hasAbbreviatedType():5902:5902 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.uu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1 -> com.android.tools.r8.internal.Pu:
     1:1:void <init>():4972:4972 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4977:4977 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):4972 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.yu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument -> com.android.tools.r8.internal.Tu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int memoizedSerializedSize -> i
@@ -58675,11 +59036,11 @@
     1:1:boolean hasTypeId():5257:5257 -> m
     1:3:void initFields():5267:5269 -> n
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder newBuilder():5385:5385 -> o
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.vu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1 -> com.android.tools.r8.internal.Qu:
     1:1:void <init>():5124:5124 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5129:5129 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):5124 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.wu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder -> com.android.tools.r8.internal.Ru:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection projection_ -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> d
     int typeId_ -> e
@@ -58723,7 +59084,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder.create():5409:5409 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Builder access$5000():5395 -> f
     1:16:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument buildPartial():5440:5455 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.xu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection -> com.android.tools.r8.internal.Su:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection IN -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection OUT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection INV -> c
@@ -58738,7 +59099,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5185:5185 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5184:5184 -> b
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Argument$Projection valueOf(int):5183:5183 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.zu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder -> com.android.tools.r8.internal.Uu:
     int outerTypeId_ -> o
     int typeParameterName_ -> l
     int typeAliasName_ -> m
@@ -58858,7 +59219,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type build():6253:6253 -> h
     1:61:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type buildPartial():6259:6319 -> i
     1:3:void ensureArgumentIsMutable():6434:6436 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.Du:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias -> com.android.tools.r8.internal.Yu:
     int expandedTypeId_ -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
     int underlyingTypeId_ -> j
@@ -58962,11 +59323,11 @@
     1:1:boolean hasName():19218:19218 -> x
     1:1:boolean hasUnderlyingType():19268:19268 -> y
     1:1:boolean hasUnderlyingTypeId():19283:19283 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.Bu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1 -> com.android.tools.r8.internal.Wu:
     1:1:void <init>():19172:19172 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19177:19177 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):19172 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.Cu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeAlias$Builder -> com.android.tools.r8.internal.Xu:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type expandedType_ -> j
     int expandedTypeId_ -> k
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type underlyingType_ -> h
@@ -59045,7 +59406,7 @@
     1:3:void ensureAnnotationIsMutable():20213:20215 -> j
     1:3:void ensureTypeParameterIsMutable():19904:19906 -> k
     1:3:void ensureVersionRequirementIsMutable():20337:20339 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.Hu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter -> com.android.tools.r8.internal.cv:
     int memoizedSerializedSize -> n
     int upperBoundIdMemoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -59130,11 +59491,11 @@
     1:1:boolean hasVariance():7510:7510 -> u
     1:6:void initFields():7578:7583 -> v
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder newBuilder():7751:7751 -> w
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.Eu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1 -> com.android.tools.r8.internal.Zu:
     1:1:void <init>():7379:7379 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7384:7384 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):7379 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.Fu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder -> com.android.tools.r8.internal.av:
     int name_ -> f
     java.util.List upperBoundId_ -> j
     java.util.List upperBound_ -> i
@@ -59182,7 +59543,7 @@
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter build():7805:7805 -> h
     1:30:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter buildPartial():7811:7840 -> i
     1:3:void ensureUpperBoundIsMutable():8059:8061 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.Gu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance -> com.android.tools.r8.internal.bv:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance IN -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance OUT -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance[] $VALUES -> d
@@ -59195,7 +59556,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7432:7432 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7431:7431 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Variance valueOf(int):7430:7430 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.Ku:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable -> com.android.tools.r8.internal.fv:
     java.util.List type_ -> e
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
@@ -59250,11 +59611,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):12996:12996 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder toBuilder():12998 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.Iu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1 -> com.android.tools.r8.internal.dv:
     1:1:void <init>():12807:12807 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12812:12812 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):12807 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.Ju:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder -> com.android.tools.r8.internal.ev:
     java.util.List type_ -> c
     int firstNullable_ -> d
     int bitField0_ -> b
@@ -59286,7 +59647,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder.create():13017:13017 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable$Builder access$11800():13003 -> f
     1:13:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable buildPartial():13046:13058 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.Nu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter -> com.android.tools.r8.internal.iv:
     byte memoizedIsInitialized -> l
     int memoizedSerializedSize -> m
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> c
@@ -59366,11 +59727,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter):18444:18444 -> z
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder toBuilder():18446 -> z
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.Lu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1 -> com.android.tools.r8.internal.gv:
     1:1:void <init>():18160:18160 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18165:18165 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):18160 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.Mu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter$Builder -> com.android.tools.r8.internal.hv:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type varargElementType_ -> i
     int varargElementTypeId_ -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type type_ -> g
@@ -59440,7 +59801,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495 -> h
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter build():18495:18495 -> h
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$ValueParameter buildPartial():18501:18528 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.Su:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement -> com.android.tools.r8.internal.nv:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> g
     int memoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement defaultInstance -> a
@@ -59504,11 +59865,11 @@
     1:1:boolean hasVersionKind():21311:21311 -> s
     1:6:void initFields():21326:21331 -> t
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder newBuilder():21462:21462 -> u
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.Ou:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1 -> com.android.tools.r8.internal.jv:
     1:1:void <init>():21034:21034 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21039:21039 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):21034 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.Pu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder -> com.android.tools.r8.internal.kv:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level level_ -> e
     int errorCode_ -> f
     int message_ -> g
@@ -59562,7 +59923,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder.create():21486:21486 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Builder access$19800():21472 -> f
     1:28:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement buildPartial():21523:21550 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.Qu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level -> com.android.tools.r8.internal.lv:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level[] $VALUES -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level HIDDEN -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level ERROR -> b
@@ -59575,7 +59936,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21087:21087 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21086:21086 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$Level valueOf(int):21085:21085 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.Ru:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind -> com.android.tools.r8.internal.mv:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind API_VERSION -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind COMPILER_VERSION -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind LANGUAGE_VERSION -> a
@@ -59588,7 +59949,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21152:21152 -> b
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21151:21151 -> b
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind valueOf(int):21150:21150 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.Vu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable -> com.android.tools.r8.internal.qv:
     java.util.List requirement_ -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable defaultInstance -> a
@@ -59633,11 +59994,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):22170:22170 -> l
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder toBuilder():22172 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.Tu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1 -> com.android.tools.r8.internal.ov:
     1:1:void <init>():22021:22021 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22026:22026 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):22021 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.Uu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder -> com.android.tools.r8.internal.pv:
     java.util.List requirement_ -> c
     int bitField0_ -> b
     1:85:void <init>():22184:22268 -> <init>
@@ -59672,7 +60033,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable$Builder access$20900():22177 -> f
     1:7:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable buildPartial():22218:22224 -> g
     1:3:void ensureRequirementIsMutable():22271:22273 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.Wu:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility -> com.android.tools.r8.internal.rv:
     int value -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility LOCAL -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility PRIVATE_TO_THIS -> e
@@ -59704,7 +60065,7 @@
     1:1:java.lang.String toString():52 -> toString
     2:6:java.lang.String toString():80:84 -> toString
     7:7:java.lang.String toString():53:53 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.Za:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags -> com.android.tools.r8.internal.ib:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField MEMBER_KIND -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField IS_SUSPEND -> p
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField HAS_GETTER -> r
@@ -59741,8 +60102,8 @@
     void $$$reportNull$$$0(int) -> a
     1:1:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):189:189 -> a
     2:2:int getAccessorFlags(boolean,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Visibility,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Modality,boolean,boolean,boolean):0:0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.Va:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.Wa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1 -> com.android.tools.r8.internal.eb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField -> com.android.tools.r8.internal.fb:
     1:1:void <init>(int):259:259 -> <init>
     1:1:java.lang.Object get(int):256:256 -> a
     2:2:int toFlags(java.lang.Object):256:256 -> a
@@ -59750,7 +60111,7 @@
     1:1:java.lang.Boolean get(int):265:265 -> b
     2:2:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField.$$$reportNull$$$0(int):0:0 -> b
     2:2:java.lang.Boolean get(int):265 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.Xa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField -> com.android.tools.r8.internal.gb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[] values -> c
     1:2:void <init>(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):280:281 -> <init>
     1:1:int toFlags(java.lang.Object):276:276 -> a
@@ -59761,7 +60122,7 @@
     9:9:int bitWidth(java.lang.Object[]):0 -> a
     10:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$EnumLiteFlagField.get(int):296:300 -> a
     10:14:java.lang.Object get(int):276 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.Ya:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField -> com.android.tools.r8.internal.hb:
     int bitWidth -> b
     int offset -> a
     1:1:void <init>(int,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$1):224:224 -> <init>
@@ -59771,9 +60132,9 @@
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField after(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite[]):226:227 -> a
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanFirst():235:235 -> a
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$BooleanFlagField booleanAfter(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.Flags$FlagField):239:240 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.wp:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.NameResolver -> com.android.tools.r8.internal.Ip:
 # {"id":"sourceFile","fileName":"NameResolver.kt"}
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.IB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.TypeTable -> com.android.tools.r8.internal.cC:
 # {"id":"sourceFile","fileName":"TypeTable.kt"}
     java.util.List types -> a
     1:20:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):21:40 -> <init>
@@ -59781,7 +60142,7 @@
     34:34:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):31:31 -> <init>
     35:35:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeTable):22:22 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type get(int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.EC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement -> com.android.tools.r8.internal.gD:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement$VersionKind kind -> c
     java.lang.String message -> f
@@ -59796,11 +60157,11 @@
     1:1:java.lang.String getMessage():29:29 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version getVersion():25:25 -> e
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.internal.BC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Companion -> com.android.tools.r8.internal.dD:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():83:83 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):83:83 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.DC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version -> com.android.tools.r8.internal.fD:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version INFINITY -> a
     int minor -> d
@@ -59816,11 +60177,11 @@
     int component3() -> c
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version.asString():33:33 -> toString
     1:1:java.lang.String toString():50 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.internal.CC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirement$Version$Companion -> com.android.tools.r8.internal.eD:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():52:52 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):52:52 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.GC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable -> com.android.tools.r8.internal.iD:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion Companion -> b
     java.util.List infos -> c
@@ -59841,7 +60202,7 @@
     166:166:java.lang.Object com.android.tools.r8.jetbrains.kotlin.collections.CollectionsKt.getOrNull(java.util.List,int):0 -> a
     166:166:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12 -> a
     167:167:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirement get(int):12:12 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.FC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion -> com.android.tools.r8.internal.hD:
 # {"id":"sourceFile","fileName":"VersionRequirement.kt"}
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
@@ -59849,7 +60210,7 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable$Companion.getEMPTY():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18 -> a
     3:5:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.deserialization.VersionRequirementTable create(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$VersionRequirementTable):18:18 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.ji:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf -> com.android.tools.r8.internal.wi:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension constructorSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension propertySignature -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension flags -> e
@@ -59864,8 +60225,8 @@
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension classLocalVariable -> j
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension anonymousObjectOriginName -> k
     1:212:void <clinit>():3800:4011 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.Sh:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.Vh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$1 -> com.android.tools.r8.internal.fi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature -> com.android.tools.r8.internal.ii:
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
     int desc_ -> f
@@ -59916,11 +60277,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature):2831:2831 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder toBuilder():2833 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.Th:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1 -> com.android.tools.r8.internal.gi:
     1:1:void <init>():2670:2670 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2675:2675 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2670 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.Uh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder -> com.android.tools.r8.internal.hi:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -59954,7 +60315,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder.create():2852:2852 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature$Builder access$2500():2838 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmFieldSignature buildPartial():2881:2892 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.Yh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature -> com.android.tools.r8.internal.li:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature defaultInstance -> a
     int memoizedSerializedSize -> h
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser PARSER -> b
@@ -60005,11 +60366,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature):2369:2369 -> n
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder toBuilder():2371 -> n
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.Wh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1 -> com.android.tools.r8.internal.ji:
     1:1:void <init>():2208:2208 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2213:2213 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):2208 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.Xh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder -> com.android.tools.r8.internal.ki:
     int desc_ -> d
     int bitField0_ -> b
     int name_ -> c
@@ -60043,7 +60404,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder.create():2390:2390 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature$Builder access$1800():2376 -> f
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature buildPartial():2419:2430 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.bi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature -> com.android.tools.r8.internal.oi:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> f
     byte memoizedIsInitialized -> i
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> g
@@ -60099,11 +60460,11 @@
     1:1:boolean hasSyntheticMethod():3232:3232 -> o
     1:4:void initFields():3276:3279 -> p
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder newBuilder():3396:3396 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.Zh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1 -> com.android.tools.r8.internal.mi:
     1:1:void <init>():3192:3192 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3197:3197 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):3192 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.ai:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder -> com.android.tools.r8.internal.ni:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature getter_ -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature setter_ -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature syntheticMethod_ -> d
@@ -60183,7 +60544,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.create():3420:3420 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder access$3200():3406 -> f
     1:20:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature buildPartial():3453:3472 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.ii:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes -> com.android.tools.r8.internal.vi:
     java.util.List localName_ -> e
     java.util.List record_ -> d
     int memoizedSerializedSize -> h
@@ -60235,11 +60596,11 @@
     1:1:java.util.List getRecordList():1568:1568 -> i
     1:2:void initFields():1633:1634 -> j
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder newBuilder():1751:1751 -> k
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.ci:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1 -> com.android.tools.r8.internal.pi:
     1:1:void <init>():171:171 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):176:176 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):171 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.di:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder -> com.android.tools.r8.internal.qi:
     java.util.List localName_ -> d
     java.util.List record_ -> c
     int bitField0_ -> b
@@ -60269,7 +60630,7 @@
     1:12:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes buildPartial():1804:1815 -> g
     1:3:void ensureLocalNameIsMutable():1996:1998 -> h
     1:3:void ensureRecordIsMutable():1872:1874 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.hi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record -> com.android.tools.r8.internal.ui:
     int memoizedSerializedSize -> n
     int replaceCharMemoizedSerializedSize -> l
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record defaultInstance -> a
@@ -60373,11 +60734,11 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record.newBuilder(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record):940:940 -> v
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder toBuilder():942 -> v
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.ei:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1 -> com.android.tools.r8.internal.ri:
     1:1:void <init>():470:470 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$1.parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):475:475 -> a
     1:1:java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite):470 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.fi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Builder -> com.android.tools.r8.internal.si:
     java.lang.Object string_ -> e
     int predefinedIndex_ -> d
     java.util.List replaceChar_ -> h
@@ -60430,7 +60791,7 @@
     1:1:int getSubstringIndexCount():1372:1372 -> j
     1:1:boolean hasOperation():1300:1300 -> k
     1:1:boolean hasPredefinedIndex():1152:1152 -> l
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.gi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation -> com.android.tools.r8.internal.ti:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation INTERNAL_TO_CLASS_ID -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation NONE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Record$Operation[] $VALUES -> d
@@ -60472,7 +60833,7 @@
     263:279:byte[] com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.BitEncoding.decode7to8(byte[]):247:263 -> a
     263:279:byte[] decodeBytes(java.lang.String[]):192 -> a
     1:2:java.lang.String[] dropMarker(java.lang.String[]):199:200 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.A5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite -> com.android.tools.r8.internal.C5:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map map -> a
     1:10:void <clinit>():20:29 -> <clinit>
@@ -60497,23 +60858,23 @@
     747:784:void <clinit>():32:69 -> <clinit>
     785:785:void <clinit>():20:20 -> <clinit>
     1:1:java.lang.String mapClass(java.lang.String):78:78 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.internal.z5:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.ClassMapperLite$map$1$1 -> com.android.tools.r8.internal.B5:
 # {"id":"sourceFile","fileName":"ClassMapperLite.kt"}
     java.util.Map $this_apply -> a
     1:1:java.lang.Object invoke(java.lang.Object,java.lang.Object):15:15 -> a
     2:2:void invoke(java.lang.String,java.lang.String):40:40 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.internal.mh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion -> com.android.tools.r8.internal.zh:
 # {"id":"sourceFile","fileName":"JvmBytecodeBinaryVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmBytecodeBinaryVersion INSTANCE -> f
     1:4:void <clinit>():19:22 -> <clinit>
     1:1:void <init>(int[]):14:14 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.zh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature -> com.android.tools.r8.internal.Mh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():14:14 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):14:14 -> <init>
     java.lang.String asString() -> a
     1:1:java.lang.String toString():27:27 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.xh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field -> com.android.tools.r8.internal.Kh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -60539,7 +60900,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Field.getDesc():23:23 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.yh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method -> com.android.tools.r8.internal.Lh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -60565,7 +60926,7 @@
     3:3:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMemberSignature$Method.getDesc():19:19 -> hashCode
     3:3:int hashCode():0 -> hashCode
     4:4:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Kh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion -> com.android.tools.r8.internal.Xh:
 # {"id":"sourceFile","fileName":"JvmMetadataVersion.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmMetadataVersion INSTANCE -> f
     boolean isStrictSemantics -> g
@@ -60577,7 +60938,7 @@
     22:37:void <clinit>():33 -> <clinit>
     1:1:void <init>(int[],boolean):14:14 -> <init>
     1:6:boolean isCompatible():20:25 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.Nh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver -> com.android.tools.r8.internal.ai:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     java.util.List PREDEFINED_STRINGS -> a
     java.util.Map PREDEFINED_STRINGS_MAP -> b
@@ -60598,11 +60959,11 @@
     2:2:boolean isLocalClassName(int):75:75 -> b
     1:1:java.lang.String[] getStrings():15:15 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes getTypes():14:14 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.Mh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmNameResolver$Companion -> com.android.tools.r8.internal.Zh:
 # {"id":"sourceFile","fileName":"JvmNameResolver.kt"}
     1:1:void <init>():77:77 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):77:77 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.ki:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil -> com.android.tools.r8.internal.xi:
 # {"id":"sourceFile","fileName":"JvmProtoBufUtil.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EXTENSION_REGISTRY -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil INSTANCE -> b
@@ -60653,7 +61014,7 @@
     45:45:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.deserialization.JvmProtoBufUtil.readPackageDataFrom(byte[],java.lang.String[]):42:42 -> c
     46:46:com.android.tools.r8.jetbrains.kotlin.Pair readPackageDataFrom(java.lang.String[],java.lang.String[]):37 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.li:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.serialization.JvmStringTable -> com.android.tools.r8.internal.yi:
 # {"id":"sourceFile","fileName":"JvmStringTable.kt"}
     java.util.LinkedHashSet localNames -> d
     java.util.ArrayList records -> b
@@ -60700,7 +61061,7 @@
     777:777:void serializeTo(java.io.OutputStream):98 -> a
     778:778:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$StringTableTypes$Builder.build():1798:1798 -> a
     778:778:void serializeTo(java.io.OutputStream):98 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.hg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner -> com.android.tools.r8.internal.ug:
 # {"id":"sourceFile","fileName":"Interner.kt"}
     java.util.HashMap interned -> b
     int firstIndex -> a
@@ -60719,14 +61080,14 @@
     5992:5995:java.lang.Integer find(java.lang.Object):19:22 -> a
     1:1:boolean isEmpty():16:16 -> b
     2:3:int intern(java.lang.Object):26:27 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.internal.gg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner$allInternedObjects$$inlined$sortedBy$1 -> com.android.tools.r8.internal.tg:
 # {"id":"sourceFile","fileName":"Comparisons.kt"}
     java.util.HashMap receiver$0$inlined -> a
     1:220:int compare(java.lang.Object,java.lang.Object):102:321 -> compare
     221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt__ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):78:78 -> compare
     221:221:int com.android.tools.r8.jetbrains.kotlin.comparisons.ComparisonsKt.compareValues(java.lang.Comparable,java.lang.Comparable):0 -> compare
     221:221:int compare(java.lang.Object,java.lang.Object):321 -> compare
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.up:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableVersionRequirementTable -> com.android.tools.r8.internal.Gp:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.Interner com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.interner -> a
     1:6:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.<init>():23:28 -> <init>
@@ -60755,7 +61116,7 @@
     42:102:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():44:44 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.MutableTable.serialize():0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.kA:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.serialization.TableElementWrapper -> com.android.tools.r8.internal.CA:
 # {"id":"sourceFile","fileName":"MutableTable.kt"}
     byte[] bytes -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder builder -> c
@@ -60894,7 +61255,7 @@
     3:3:java.lang.String toString():888:888 -> toString
     1:4:void write(int):794:797 -> write
     5:19:void write(byte[],int,int):802:816 -> write
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.C6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream -> com.android.tools.r8.internal.H6:
     byte[] buffer -> a
     int currentLimit -> h
     int recursionDepth -> i
@@ -61002,7 +61363,7 @@
     7:7:int readTag():158 -> p
     8:8:int readTag():158:158 -> p
     1:8:void recomputeBufferSizeAfterLimit():1001:1008 -> q
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.E6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream -> com.android.tools.r8.internal.J6:
     byte[] buffer -> a
     java.io.OutputStream output -> e
     int totalBytesWritten -> d
@@ -61099,9 +61460,9 @@
     1:6:void writeRawByte(int):1042 -> f
     1:4:void writeRawLittleEndian32(int):1246:1249 -> g
     1:4:void writeRawVarint32(int):1195:1198 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.D6:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream$OutOfSpaceException -> com.android.tools.r8.internal.I6:
     1:1:void <init>():1016:1016 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.ga:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite -> com.android.tools.r8.internal.pa:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite EMPTY -> a
     java.util.Map extensionsByNumber -> b
     1:1:void <clinit>():159:159 -> <clinit>
@@ -61119,13 +61480,13 @@
     6:6:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125 -> a
     7:7:void add(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):125:125 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite newInstance():92:92 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.fa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite$ObjectIntPair -> com.android.tools.r8.internal.oa:
     java.lang.Object object -> a
     int number -> b
     1:3:void <init>(java.lang.Object,int):167:169 -> <init>
     1:5:boolean equals(java.lang.Object):178:182 -> equals
     1:1:int hashCode():174:174 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Ga:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet -> com.android.tools.r8.internal.Pa:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap fields -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet DEFAULT_INSTANCE -> a
     boolean isImmutable -> c
@@ -61378,8 +61739,8 @@
     1:5:java.util.Iterator iterator():197:201 -> e
     1:5:void makeImmutable():107:111 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet newFieldSet():92:92 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Fa:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Ab:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet$FieldDescriptorLite -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite -> com.android.tools.r8.internal.Jb:
     1:1:void <init>():53:53 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder):56:56 -> <init>
     1:1:boolean parseUnknownField(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite,int):73:73 -> a
@@ -61471,15 +61832,15 @@
     144:144:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newSingularGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,java.lang.Object,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,java.lang.Class):639:639 -> a
     145:146:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension newRepeatedGeneratedExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType,boolean,java.lang.Class):661:662 -> a
     147:149:java.lang.reflect.Method getMethodOrDie(java.lang.Class,java.lang.String,java.lang.Class[]):735:737 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.ub:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.vb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$1 -> com.android.tools.r8.internal.Db:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder -> com.android.tools.r8.internal.Eb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString unknownFields -> a
     1:45:void <init>():87:131 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder mergeFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$Builder setUnknownFields(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):127:127 -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite getDefaultInstanceForType() -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString getUnknownFields():123:123 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.wb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder -> com.android.tools.r8.internal.Fb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> b
     boolean extensionsIsMutable -> c
     1:3:void <init>():332:334 -> <init>
@@ -61512,7 +61873,7 @@
     19:19:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder.verifyExtensionContainingType(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension):371:371 -> b
     19:19:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder setExtension(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension,java.lang.Object):431 -> b
     1:3:void ensureExtensionsIsMutable():350:352 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.xb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage -> com.android.tools.r8.internal.Gb:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.FieldSet extensions -> a
     1:2:void <init>():171:172 -> <init>
     3:4:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableBuilder):175:176 -> <init>
@@ -61548,7 +61909,7 @@
     1:1:int extensionsSerializedSize():316:316 -> h
     1:1:void makeExtensionsImmutable():261:261 -> i
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter newExtensionWriter():308:308 -> j
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.xb$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage$ExtensionWriter -> com.android.tools.r8.internal.Gb$a:
     java.util.Map$Entry next -> b
     java.util.Iterator iter -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtendableMessage this$0 -> d
@@ -61585,7 +61946,7 @@
     14:14:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream.writeMessageSetExtension(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):355 -> a
     14:14:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):293 -> a
     15:20:void writeUntil(int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedOutputStream):296:301 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.yb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor -> com.android.tools.r8.internal.Hb:
     boolean isPacked -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap enumTypeMap -> a
     int number -> b
@@ -61596,7 +61957,7 @@
     1:1:int compareTo(java.lang.Object):671:671 -> compareTo
     2:2:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.compareTo(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor):725:725 -> compareTo
     2:2:int compareTo(java.lang.Object):671 -> compareTo
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.zb:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$GeneratedExtension -> com.android.tools.r8.internal.Ib:
     java.lang.Object defaultValue -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor descriptor -> d
     java.lang.reflect.Method enumValueOf -> e
@@ -61618,14 +61979,14 @@
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.getLiteJavaType():702:702 -> b
     2:2:java.lang.Object singularToFieldSetType(java.lang.Object):885 -> b
     3:4:java.lang.Object singularToFieldSetType(java.lang.Object):885:886 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.cg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal -> com.android.tools.r8.internal.pg:
     byte[] EMPTY_BYTE_ARRAY -> a
     1:6:void <clinit>():383:388 -> <clinit>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.ag:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite -> com.android.tools.r8.internal.ng:
     int getNumber() -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.bg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLiteMap -> com.android.tools.r8.internal.og:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Internal$EnumLite findValueByNumber(int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.mg:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException -> com.android.tools.r8.internal.zg:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite unfinishedMessage -> a
     1:1:void <init>(java.lang.String):46:46 -> <init>
     2:2:void <init>(java.lang.String):43:43 -> <init>
@@ -61634,14 +61995,14 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException negativeSize():78:78 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException recursionLimitExceeded():104:104 -> c
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.InvalidProtocolBufferException truncatedMessage():70:70 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.Wl:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator -> com.android.tools.r8.internal.jm:
     java.util.Iterator iterator -> a
     1:2:void <init>(java.util.Iterator):130:131 -> <init>
     1:1:boolean hasNext():136:136 -> hasNext
     1:2:java.util.Map$Entry com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LazyField$LazyIterator.next():142:143 -> next
     1:2:java.lang.Object next():127 -> next
     1:1:void remove():151:151 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.Lm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString -> com.android.tools.r8.internal.Ym:
     int hash -> d
     byte[] bytes -> c
     1:180:void <init>(byte[]):62:241 -> <init>
@@ -61673,8 +62034,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator iterator():307:307 -> i
     1:1:java.util.Iterator iterator():52:52 -> iterator
     1:1:int size():76:76 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.Jm:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.Km:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$1 -> com.android.tools.r8.internal.Wm:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator -> com.android.tools.r8.internal.Xm:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString this$0 -> c
     int limit -> b
     int position -> a
@@ -61685,12 +62046,12 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString$LiteralByteIterator.next():325:325 -> next
     1:1:java.lang.Object next():310 -> next
     1:1:void remove():337:337 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.mo:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLiteOrBuilder -> com.android.tools.r8.internal.yo:
     boolean isInitialized() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite getDefaultInstanceForType() -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.qs:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Parser -> com.android.tools.r8.internal.Cs:
     java.lang.Object parsePartialFrom(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.CodedInputStream,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ExtensionRegistryLite) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.rx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString -> com.android.tools.r8.internal.Kx:
     int[] minLengthByDepth -> c
     int treeDepth -> h
     int hash -> i
@@ -61740,8 +62101,8 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString.iterator():779:779 -> iterator
     1:1:java.util.Iterator iterator():70 -> iterator
     1:1:int size():269:269 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.nx:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.ox:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1 -> com.android.tools.r8.internal.Gx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer -> com.android.tools.r8.internal.Hx:
     java.util.Stack prefixesStack -> a
     1:5:void <init>():602:606 -> <init>
     6:6:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):602:602 -> <init>
@@ -61763,7 +62124,7 @@
     47:47:void com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$Balancer.insert(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):664:664 -> a
     47:47:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):629 -> a
     48:53:void doBalance(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString):630:635 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.px:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator -> com.android.tools.r8.internal.Ix:
     java.util.Stack breadCrumbs -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$1):716:716 -> <init>
@@ -61784,7 +62145,7 @@
     14:14:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.LiteralByteString next():762:762 -> l
     1:1:java.lang.Object next():716:716 -> next
     1:1:void remove():770:770 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.qx:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator -> com.android.tools.r8.internal.Jx:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.ByteString$ByteIterator bytes -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$PieceIterator pieces -> a
     int bytesRemaining -> c
@@ -61795,7 +62156,7 @@
     1:1:java.lang.Byte com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.RopeByteString$RopeByteIterator.next():799:799 -> next
     1:1:java.lang.Object next():782 -> next
     1:1:void remove():811:811 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.internal.py:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap -> com.android.tools.r8.internal.Iy:
     java.util.List entryList -> b
     java.util.Map overflowEntries -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet lazyEntrySet -> e
@@ -61822,38 +62183,38 @@
     10:11:java.lang.Object removeArrayEntryAt(int):303:304 -> e
     1:4:java.util.Set entrySet():353:356 -> entrySet
     1:6:java.lang.Object get(java.lang.Object):227:232 -> get
-    1:2:void checkMutable():364:365 -> i
-    1:1:int getNumArrayEntries():180:180 -> j
-    1:1:java.lang.Iterable getOverflowEntries():195:195 -> k
-    1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> l
-    1:1:boolean isImmutable():175:175 -> m
-    1:9:void makeImmutable():161:169 -> n
+    1:2:void checkMutable():364:365 -> h
+    1:1:int getNumArrayEntries():180:180 -> i
+    1:1:java.lang.Iterable getOverflowEntries():195:195 -> j
+    1:5:java.util.SortedMap getOverflowEntriesMutable():377:381 -> k
+    1:1:boolean isImmutable():175:175 -> l
+    1:9:void makeImmutable():161:169 -> m
     1:13:java.lang.Object remove(java.lang.Object):279:291 -> remove
     1:1:int size():202:202 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.ly:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1 -> com.android.tools.r8.internal.Ey:
     1:1:void <init>(int):100:100 -> <init>
-    1:5:void makeImmutable():104:108 -> n
-    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> n
-    6:6:void makeImmutable():108 -> n
-    7:13:void makeImmutable():109:115 -> n
-    14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> n
-    14:14:void makeImmutable():115 -> n
-    15:20:void makeImmutable():116:121 -> n
+    1:5:void makeImmutable():104:108 -> m
+    6:6:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
+    6:6:void makeImmutable():108 -> m
+    7:13:void makeImmutable():109:115 -> m
+    14:14:boolean com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.GeneratedMessageLite$ExtensionDescriptor.isRepeated():706:706 -> m
+    14:14:void makeImmutable():115 -> m
+    15:20:void makeImmutable():116:121 -> m
     1:1:java.lang.Object put(java.lang.Object,java.lang.Object):100:100 -> put
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.oy:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet -> com.android.tools.r8.internal.Hy:
     java.util.Iterator ITERATOR -> a
     java.lang.Iterable ITERABLE -> b
     1:16:void <clinit>():591:606 -> <clinit>
     1:1:java.util.Iterator access$700():589:589 -> a
     1:1:java.lang.Iterable iterable():615:615 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.my:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$1 -> com.android.tools.r8.internal.Fy:
     1:1:void <init>():591:591 -> <init>
     1:1:java.lang.Object next():598:598 -> next
     1:1:void remove():602:602 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.ny:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EmptySet$2 -> com.android.tools.r8.internal.Gy:
     1:1:void <init>():606:606 -> <init>
     1:1:java.util.Iterator iterator():609:609 -> iterator
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.py$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$Entry -> com.android.tools.r8.internal.Iy$a:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> c
     java.lang.Object value -> b
     java.lang.Comparable key -> a
@@ -61877,7 +62238,7 @@
     1:1:int hashCode():452:452 -> hashCode
     1:3:java.lang.Object setValue(java.lang.Object):431:433 -> setValue
     1:1:java.lang.String toString():458:458 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.py$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntryIterator -> com.android.tools.r8.internal.Iy$b:
     java.util.Iterator lazyOverflowIterator -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> d
     boolean nextCalledBeforeRemove -> b
@@ -61890,7 +62251,7 @@
     1:7:java.lang.Object next():532 -> next
     1:10:void remove():557:566 -> remove
     11:11:void remove():558:558 -> remove
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.py$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$EntrySet -> com.android.tools.r8.internal.Iy$c:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap this$0 -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap):470:470 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.SmallSortedMap$1):470:470 -> <init>
@@ -61902,9 +62263,9 @@
     1:1:java.util.Iterator iterator():474:474 -> iterator
     1:3:boolean remove(java.lang.Object):514:516 -> remove
     1:1:int size():479:479 -> size
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.UB:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.UninitializedMessageException -> com.android.tools.r8.internal.pC:
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.MessageLite):53:53 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.oC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8 -> com.android.tools.r8.internal.NC:
     int incompleteStateFor(int,int) -> a
     int incompleteStateFor(int,int,int) -> a
     1:66:int partialIsValidUtf8(int,byte[],int,int):163:228 -> a
@@ -61913,10 +62274,10 @@
     1:1:int partialIsValidUtf8(byte[],int,int):252:252 -> b
     2:38:int com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.Utf8.partialIsValidUtf8NonAscii(byte[],int,int):270:306 -> b
     2:38:int partialIsValidUtf8(byte[],int,int):256 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.dD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat -> com.android.tools.r8.internal.TD:
     int makeTag(int,int) -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.WC:
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.bD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$1 -> com.android.tools.r8.internal.MD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType -> com.android.tools.r8.internal.RD:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType DOUBLE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType[] $VALUES -> s
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType INT64 -> c
@@ -61945,18 +62306,18 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType getJavaType():143:143 -> a
     1:1:int getWireType():144:144 -> b
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.XC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$1 -> com.android.tools.r8.internal.ND:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):116:116 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.YC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$2 -> com.android.tools.r8.internal.OD:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):119:119 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.ZC:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$3 -> com.android.tools.r8.internal.PD:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):122:122 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.aD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$FieldType$4 -> com.android.tools.r8.internal.QD:
     1:1:void <init>(java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType,int):125:125 -> <init>
     boolean isPackable() -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.cD:
+com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType -> com.android.tools.r8.internal.SD:
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType STRING -> f
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.protobuf.WireFormat$JavaType BYTE_STRING -> g
     java.lang.Object defaultDefault -> k
@@ -61971,7 +62332,7 @@
     1:9:void <clinit>():78:86 -> <clinit>
     10:10:void <clinit>():77:77 -> <clinit>
     1:2:void <init>(java.lang.String,int,java.lang.Object):88:89 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.oh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmClassExtensionVisitor -> com.android.tools.r8.internal.Bh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():78:78 -> <clinit>
@@ -61984,7 +62345,7 @@
     1:1:void visitEnd():68 -> b
     2:2:void visitEnd():68:68 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():54:54 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.qh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor -> com.android.tools.r8.internal.Dh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     1:1:void <clinit>():260:260 -> <clinit>
@@ -61992,14 +62353,14 @@
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmConstructorExtensionVisitor,int,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):237:237 -> <init>
     void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():240:240 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.rh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor -> com.android.tools.r8.internal.Eh:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor delegate -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor):14:14 -> <init>
     void visitModuleName(java.lang.String) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmDeclarationContainerExtensionVisitor getDelegate():15:15 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):34:34 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.sh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt -> com.android.tools.r8.internal.Fh:
 # {"id":"sourceFile","fileName":"jvmExtensions.kt"}
     1:32:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):0:31 -> a
     1:32:java.util.List getAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):167 -> a
@@ -62016,7 +62377,7 @@
     33:33:boolean isRaw(com.android.tools.r8.jetbrains.kotlinx.metadata.KmType):158:158 -> b
     34:34:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getGetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):110:110 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):121:121 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.th:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature -> com.android.tools.r8.internal.Gh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -62033,7 +62394,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature.getDesc():51:51 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.vh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor -> com.android.tools.r8.internal.Ih:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFunctionExtensionVisitor delegate -> b
@@ -62044,7 +62405,7 @@
     2:2:void visitLambdaClassOriginName(java.lang.String):137:137 -> a
     3:3:void visitEnd():144:144 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():119:119 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.wh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature -> com.android.tools.r8.internal.Jh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     1:1:void <init>():16:16 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):16:16 -> <init>
@@ -62052,7 +62413,7 @@
     java.lang.String getDesc() -> b
     java.lang.String getName() -> c
     1:1:java.lang.String toString():30:30 -> toString
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.Lh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature -> com.android.tools.r8.internal.Yh:
 # {"id":"sourceFile","fileName":"JvmMemberSignature.kt"}
     java.lang.String name -> a
     java.lang.String desc -> b
@@ -62069,7 +62430,7 @@
     1:1:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature.getDesc():40:40 -> hashCode
     1:1:int hashCode():0 -> hashCode
     2:2:int hashCode():0:0 -> hashCode
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.Ph:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPackageExtensionVisitor -> com.android.tools.r8.internal.ci:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> b
     1:1:void <clinit>():108:108 -> <clinit>
@@ -62081,7 +62442,7 @@
     1:1:void visitEnd():98 -> b
     2:2:void visitEnd():98:98 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():92:92 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.Rh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor -> com.android.tools.r8.internal.ei:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmPropertyExtensionVisitor delegate -> b
@@ -62095,7 +62456,7 @@
     4:4:void visitSyntheticMethodForAnnotations(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):212:212 -> a
     5:5:void visitEnd():219:219 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():165:165 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.ni:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor -> com.android.tools.r8.internal.Ai:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeExtensionVisitor delegate -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
@@ -62106,7 +62467,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):324:324 -> a
     2:2:void visitEnd():331:331 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():307:307 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.pi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor -> com.android.tools.r8.internal.Ci:
 # {"id":"sourceFile","fileName":"jvmExtensionVisitors.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmTypeParameterExtensionVisitor delegate -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType TYPE -> a
@@ -62116,7 +62477,7 @@
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):279:279 -> a
     2:2:void visitEnd():286:286 -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType getType():271:271 -> getType
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.ak:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader -> com.android.tools.r8.internal.nk:
 # {"id":"sourceFile","fileName":"KotlinClassHeader.kt"}
     java.lang.String packageName -> i
     java.lang.String extraString -> h
@@ -62138,14 +62499,14 @@
     1:1:int getKind():44:44 -> f
     1:1:int[] getMetadataVersion():52:52 -> g
     1:1:java.lang.String getPackageName():88:88 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.dk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata -> com.android.tools.r8.internal.qk:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader header -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion Companion -> a
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):25:25 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader,com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):25:25 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader getHeader():25:25 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.dk$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class -> com.android.tools.r8.internal.qk$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy classData$delegate -> d
@@ -62158,7 +62519,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
     4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassVisitor):48:49 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass toKmClass():40 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.internal.dk$a$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer -> com.android.tools.r8.internal.qk$a$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():55:55 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):68:69 -> i
@@ -62185,7 +62546,7 @@
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write(int[],int[],int):72 -> i
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$Writer,int[],int[],int,int,java.lang.Object):70 -> i
     86:86:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class write():0 -> i
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.internal.dk$a$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2 -> com.android.tools.r8.internal.qk$a$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2.invoke():31:33 -> a
@@ -62197,11 +62558,11 @@
     5:5:java.lang.Object invoke():29 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class$classData$2.invoke():32:32 -> a
     6:6:java.lang.Object invoke():29 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.dk$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion -> com.android.tools.r8.internal.qk$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():326:326 -> <init>
     2:2:void <init>(com.android.tools.r8.jetbrains.kotlin.jvm.internal.DefaultConstructorMarker):326:326 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.internal.dk$c:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade -> com.android.tools.r8.internal.qk$c:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> d
@@ -62214,7 +62575,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
     4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):103:104 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():95 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.internal.dk$c$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer -> com.android.tools.r8.internal.qk$c$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():110:110 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):123:124 -> h
@@ -62225,7 +62586,7 @@
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write(int[],int[],int):128:131 -> h
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$Writer,int[],int[],int,int,java.lang.Object):125 -> h
     133:136:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade write():0 -> h
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.internal.dk$c$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2 -> com.android.tools.r8.internal.qk$c$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():86:88 -> a
@@ -62237,12 +62598,12 @@
     5:5:java.lang.Object invoke():84 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade$packageData$2.invoke():87:87 -> a
     6:6:java.lang.Object invoke():84 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.dk$d:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassFacade -> com.android.tools.r8.internal.qk$d:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     java.util.List partClassNames -> c
     1:5:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):217:221 -> <init>
     1:1:java.util.List getPartClassNames():221:221 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.dk$e:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart -> com.android.tools.r8.internal.qk$e:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy packageData$delegate -> d
@@ -62255,7 +62616,7 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
     4:5:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackageVisitor):285:286 -> b
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage toKmPackage():277 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.internal.dk$e$a:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer -> com.android.tools.r8.internal.qk$e$a:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():292:292 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):307:308 -> a
@@ -62266,7 +62627,7 @@
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write(java.lang.String,int[],int[],int):312:315 -> a
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$Writer,java.lang.String,int[],int[],int,int,java.lang.Object):309 -> a
     317:320:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart write(java.lang.String):0 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.internal.dk$e$b:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2 -> com.android.tools.r8.internal.qk$e$b:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:3:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():262:264 -> a
@@ -62278,7 +62639,7 @@
     5:5:java.lang.Object invoke():260 -> a
     6:6:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart$packageData$2.invoke():263:263 -> a
     6:6:java.lang.Object invoke():260 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.dk$f:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass -> com.android.tools.r8.internal.qk$f:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlin.reflect.KProperty[] $$delegatedProperties -> c
     com.android.tools.r8.jetbrains.kotlin.Lazy functionData$delegate -> d
@@ -62294,7 +62655,7 @@
     174:176:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
     177:177:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):170:170 -> c
     177:177:com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda toKmLambda():153 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.internal.ek:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer -> com.android.tools.r8.internal.rk:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>():183:183 -> <init>
     1:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):196:197 -> d
@@ -62311,15 +62672,15 @@
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write(int[],int[],int):204:207 -> d
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer.write$default(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$Writer,int[],int[],int,int,java.lang.Object):198 -> d
     213:216:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass write():0 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.internal.fk:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2 -> com.android.tools.r8.internal.sk:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader $header -> a
     1:2:com.android.tools.r8.jetbrains.kotlin.Pair com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass$functionData$2.invoke():142:143 -> a
     1:2:java.lang.Object invoke():140 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.dk$g:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Unknown -> com.android.tools.r8.internal.qk$g:
 # {"id":"sourceFile","fileName":"KotlinClassMetadata.kt"}
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):324:324 -> <init>
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.nh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension -> com.android.tools.r8.internal.Ah:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String anonymousObjectOriginName -> e
@@ -62338,7 +62699,7 @@
     1:1:java.lang.String getAnonymousObjectOriginName():37:37 -> c
     1:1:java.util.List getLocalDelegatedProperties():35:35 -> d
     1:1:java.lang.String getModuleName():36:36 -> e
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.ph:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmConstructorExtension -> com.android.tools.r8.internal.Ch:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> b
     1:1:void <init>():133:133 -> <init>
@@ -62350,7 +62711,7 @@
     146:146:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():134:134 -> a
     147:147:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):137:137 -> a
     1:1:void setSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):134:134 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.uh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension -> com.android.tools.r8.internal.Hh:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature signature -> c
     java.lang.String lambdaClassOriginName -> d
@@ -62364,7 +62725,7 @@
     103:103:void visitLambdaClassOriginName(java.lang.String):91:91 -> a
     1:1:java.lang.String getLambdaClassOriginName():84:84 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSignature():83:83 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Jh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions -> com.android.tools.r8.internal.Wh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     1:1:void <init>():17:17 -> <init>
     1:279:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions.toJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):0:278 -> a
@@ -62395,7 +62756,7 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmPropertyExtension createPropertyExtension():267:267 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeExtension createTypeExtension():273:273 -> f
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.impl.extensions.KmTypeParameterExtension createTypeParameterExtension():271:271 -> g
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Bh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 -> com.android.tools.r8.internal.Oh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Class$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
@@ -62403,21 +62764,21 @@
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):116:116 -> a
     2:3:void visitModuleName(java.lang.String):121:122 -> a
     1:1:void visitAnonymousObjectOriginName(java.lang.String):111:111 -> b
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Ah:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Nh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):109:109 -> a
     2:119:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeClassExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:117 -> a
     2:119:java.lang.Object invoke(java.lang.Object):109 -> a
     120:120:java.lang.Object invoke(java.lang.Object):109:109 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Ch:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeConstructorExtensions$1 -> com.android.tools.r8.internal.Ph:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> b
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Constructor$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):226:226 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):229:229 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Dh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeFunctionExtensions$1 -> com.android.tools.r8.internal.Qh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> e
@@ -62425,21 +62786,21 @@
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Function$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):151:151 -> <init>
     1:1:void visit(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):154:154 -> a
     2:2:void visitLambdaClassOriginName(java.lang.String):159:159 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Fh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 -> com.android.tools.r8.internal.Sh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder $proto -> d
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> c
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext,com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Package$Builder):132:132 -> <init>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor visitLocalDelegatedProperty(int,java.lang.String,int,int):135:135 -> a
     2:3:void visitModuleName(java.lang.String):140:141 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Eh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1 -> com.android.tools.r8.internal.Rh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1 this$0 -> a
     1:1:java.lang.Object invoke(java.lang.Object):132:132 -> a
     2:138:void com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePackageExtensions$1$visitLocalDelegatedProperty$1.invoke(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Property$Builder):0:136 -> a
     2:138:java.lang.Object invoke(java.lang.Object):132 -> a
     139:139:java.lang.Object invoke(java.lang.Object):132:132 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Gh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writePropertyExtensions$1 -> com.android.tools.r8.internal.Th:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions this$0 -> e
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder signature -> d
@@ -62468,20 +62829,20 @@
     36:36:void visitEnd():216 -> a
     37:37:com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.jvm.JvmProtoBuf$JvmPropertySignature$Builder.build():3447:3447 -> a
     37:37:void visitEnd():216 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Hh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeExtensions$1 -> com.android.tools.r8.internal.Uh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$Type$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):248:248 -> <init>
     1:1:void visit(boolean):251:251 -> a
     2:2:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):256:256 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Ih:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions$writeTypeParameterExtensions$1 -> com.android.tools.r8.internal.Vh:
 # {"id":"sourceFile","fileName":"JvmMetadataExtensions.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder $proto -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext $c -> d
     1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.internal.metadata.ProtoBuf$TypeParameter$Builder,com.android.tools.r8.jetbrains.kotlinx.metadata.impl.WriteContext):239:239 -> <init>
     1:1:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):241:241 -> a
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.Oh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPackageExtension -> com.android.tools.r8.internal.bi:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List localDelegatedProperties -> c
     java.lang.String moduleName -> d
@@ -62497,7 +62858,7 @@
     189:189:void visitModuleName(java.lang.String):69:69 -> a
     1:1:java.util.List getLocalDelegatedProperties():62:62 -> c
     1:1:java.lang.String getModuleName():63:63 -> d
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.Qh:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmPropertyExtension -> com.android.tools.r8.internal.di:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature syntheticMethodForAnnotations -> g
     int jvmFlags -> c
@@ -62517,7 +62878,7 @@
     1:1:int getJvmFlags():103:103 -> d
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSetterSignature():106:106 -> e
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getSyntheticMethodForAnnotations():107:107 -> f
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.mi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeExtension -> com.android.tools.r8.internal.zi:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> d
     boolean isRaw -> c
@@ -62533,7 +62894,7 @@
     187:187:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):169:169 -> a
     1:1:java.util.List getAnnotations():162:162 -> b
     1:1:boolean isRaw():161:161 -> c
-com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.oi:
+com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmTypeParameterExtension -> com.android.tools.r8.internal.Bi:
 # {"id":"sourceFile","fileName":"jvmExtensionNodes.kt"}
     java.util.List annotations -> c
     1:2:void <init>():146:147 -> <init>
@@ -62546,39 +62907,39 @@
     185:185:void accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionVisitor):146 -> a
     186:186:void visitAnnotation(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation):150:150 -> a
     1:1:java.util.List getAnnotations():147:147 -> b
-com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Cj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmAnnotationVisitorProvider -> com.android.tools.r8.internal.Pj:
     void get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotation) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Dj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Ej:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Fj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider -> com.android.tools.r8.internal.Qj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider -> com.android.tools.r8.internal.Rj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider -> com.android.tools.r8.internal.Sj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectVisitor get(com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectType,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Gj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider -> com.android.tools.r8.internal.Tj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Hj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider -> com.android.tools.r8.internal.Uj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunctionVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Ij:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Jj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider -> com.android.tools.r8.internal.Vj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider -> com.android.tools.r8.internal.Wj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyVisitor get(int,java.lang.String,int,int) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Kj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider -> com.android.tools.r8.internal.Xj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeAliasVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Lj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeParameterVisitorProvider -> com.android.tools.r8.internal.Yj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeParameterVisitor get(int,java.lang.String,int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.Mj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider -> com.android.tools.r8.internal.Zj:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor get(int,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.Nj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.Oj:
-com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.Pj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider -> com.android.tools.r8.internal.ak:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeVisitorProvider -> com.android.tools.r8.internal.bk:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider -> com.android.tools.r8.internal.ck:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmValueParameterVisitor get(int,java.lang.String) -> a
-com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.Qj:
-com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.Sj:
+com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider -> com.android.tools.r8.internal.dk:
+com.android.tools.r8.kotlin.Kotlin -> com.android.tools.r8.internal.fk:
     com.android.tools.r8.kotlin.Kotlin$Functional functional -> b
     com.android.tools.r8.kotlin.Kotlin$Metadata metadata -> d
     com.android.tools.r8.kotlin.Kotlin$_Assertions assertions -> e
     com.android.tools.r8.kotlin.Kotlin$Intrinsics intrinsics -> c
     com.android.tools.r8.graph.DexItemFactory factory -> a
     1:6:void <init>(com.android.tools.r8.graph.DexItemFactory):38:43 -> <init>
-com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.Sj$a:
-com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.Sj$b:
+com.android.tools.r8.kotlin.Kotlin$1 -> com.android.tools.r8.internal.fk$a:
+com.android.tools.r8.kotlin.Kotlin$Functional -> com.android.tools.r8.internal.fk$b:
     com.android.tools.r8.kotlin.Kotlin this$0 -> f
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap functions -> b
     com.android.tools.r8.graph.DexString kotlinStyleLambdaInstanceName -> c
@@ -62598,7 +62959,7 @@
     3:3:int getArity(com.android.tools.r8.graph.DexType):86 -> a
     4:6:int getArity(com.android.tools.r8.graph.DexType):86:88 -> a
     1:1:boolean isFunctionInterface(com.android.tools.r8.graph.DexType):82:82 -> b
-com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.Sj$c:
+com.android.tools.r8.kotlin.Kotlin$Intrinsics -> com.android.tools.r8.internal.fk$c:
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexMethod throwNpe -> d
     com.android.tools.r8.graph.DexMethod checkParameterIsNotNull -> c
@@ -62608,7 +62969,7 @@
     5:8:void <init>(com.android.tools.r8.kotlin.Kotlin):113:116 -> <init>
     9:13:void <init>(com.android.tools.r8.kotlin.Kotlin):115:119 -> <init>
     14:14:void <init>(com.android.tools.r8.kotlin.Kotlin):118:118 -> <init>
-com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.Sj$d:
+com.android.tools.r8.kotlin.Kotlin$Metadata -> com.android.tools.r8.internal.fk$d:
     com.android.tools.r8.graph.DexString kind -> a
     com.android.tools.r8.graph.DexString metadataVersion -> b
     com.android.tools.r8.graph.DexString bytecodeVersion -> c
@@ -62619,13 +62980,13 @@
     com.android.tools.r8.graph.DexString packageName -> g
     com.android.tools.r8.graph.DexString extraInt -> h
     1:9:void <init>(com.android.tools.r8.kotlin.Kotlin):92:100 -> <init>
-com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.Sj$e:
+com.android.tools.r8.kotlin.Kotlin$_Assertions -> com.android.tools.r8.internal.fk$e:
     com.android.tools.r8.graph.DexString enabledFieldName -> b
     com.android.tools.r8.graph.DexType type -> a
     com.android.tools.r8.graph.DexField enabledField -> c
     com.android.tools.r8.kotlin.Kotlin this$0 -> d
     1:5:void <init>(com.android.tools.r8.kotlin.Kotlin):103:107 -> <init>
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.Yj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo -> com.android.tools.r8.internal.lk:
     java.util.Map EMPTY_ARGUMENTS -> a
     1:1:void <clinit>():30:30 -> <clinit>
     1:1:void <init>():27:27 -> <init>
@@ -62634,14 +62995,14 @@
     2:6:java.util.Map create(java.util.Map,com.android.tools.r8.graph.DexItemFactory):51:55 -> a
     7:7:void lambda$create$0(java.util.LinkedHashMap,com.android.tools.r8.graph.DexItemFactory,java.lang.String,com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):55:55 -> a
     1:10:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo createArgument(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument,com.android.tools.r8.graph.DexItemFactory):36:45 -> b
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.Tj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo -> com.android.tools.r8.internal.gk:
     com.android.tools.r8.kotlin.KotlinAnnotationInfo value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinAnnotationInfo):117:118 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):123:124 -> a
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationAnnotationValueInfo access$200(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$AnnotationValue,com.android.tools.r8.graph.DexItemFactory):113 -> a
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):129:129 -> a
     4:7:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):134:137 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.Uj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo -> com.android.tools.r8.internal.hk:
     java.util.List value -> c
     com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo EMPTY -> b
     1:2:void <clinit>():145:146 -> <clinit>
@@ -62650,14 +63011,14 @@
     1:8:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationArrayValueInfo access$300(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$ArrayValue,com.android.tools.r8.graph.DexItemFactory):143 -> a
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):167:168 -> a
     11:19:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):174:182 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.Vj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo -> com.android.tools.r8.internal.ik:
     com.android.tools.r8.kotlin.KotlinTypeReference value -> b
     1:2:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference):63:64 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):68:69 -> a
     1:2:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationClassValueInfo access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$KClassValue,com.android.tools.r8.graph.DexItemFactory):59 -> a
     3:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):74:74 -> a
     4:5:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):79:80 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.Wj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo -> com.android.tools.r8.internal.jk:
     java.lang.String enumEntryName -> c
     com.android.tools.r8.kotlin.KotlinTypeReference enumClassName -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,java.lang.String):89:91 -> <init>
@@ -62665,14 +63026,14 @@
     1:3:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationEnumValueInfo access$100(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument$EnumValue,com.android.tools.r8.graph.DexItemFactory):84 -> a
     4:4:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):102:102 -> a
     5:6:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):107:108 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.Xj:
+com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo -> com.android.tools.r8.internal.kk:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument argument -> b
     1:2:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):190:191 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo.create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):195:195 -> a
     1:1:com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo$KotlinAnnotationPrimitiveArgumentInfo access$400(com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument):186 -> a
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.KmAnnotationArgument rewrite(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):205:205 -> a
-com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.Zj:
+com.android.tools.r8.kotlin.KotlinAnnotationInfo -> com.android.tools.r8.internal.mk:
     java.util.List EMPTY_ANNOTATIONS -> a
     java.util.Map arguments -> c
     com.android.tools.r8.kotlin.KotlinTypeReference annotationType -> b
@@ -62687,7 +63048,7 @@
     31:33:void lambda$rewrite$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.util.Map,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):65:67 -> a
     34:35:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):75:76 -> a
     36:36:void lambda$trace$1(com.android.tools.r8.graph.DexDefinitionSupplier,java.lang.String,com.android.tools.r8.kotlin.KotlinAnnotationArgumentInfo):76:76 -> a
-com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.bk:
+com.android.tools.r8.kotlin.KotlinClassInfo -> com.android.tools.r8.internal.ok:
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> k
     java.lang.String packageName -> m
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> n
@@ -62713,7 +63074,7 @@
     35:35:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):43:43 -> a
     35:35:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):193 -> a
     35:35:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
-    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
+    36:36:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
     36:36:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.missingCompanionObject(com.android.tools.r8.graph.DexClass,java.lang.String):44 -> a
     36:36:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):193 -> a
     36:36:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):120 -> a
@@ -62757,63 +63118,64 @@
     333:333:java.util.function.Consumer lambda$trace$2(com.android.tools.r8.kotlin.KotlinTypeInfo):310:310 -> a
     334:334:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinTypeReference):311:311 -> a
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinTypeReference):312:312 -> b
-    1:1:java.lang.String getPackageName():297:297 -> g
+    1:1:java.lang.String getPackageName():297:297 -> h
     1:1:int[] getMetadataVersion():302:302 -> n
-com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.ck:
+com.android.tools.r8.kotlin.KotlinClassLevelInfo -> com.android.tools.r8.internal.pk:
+    boolean isNoKotlinInformation() -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
-    java.lang.String getPackageName() -> g
-    boolean isSyntheticClass() -> i
-    boolean isNoKotlinInformation() -> j
+    java.lang.String getPackageName() -> h
+    boolean isSyntheticClass() -> j
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> k
     int[] getMetadataVersion() -> n
-com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.gk:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader -> com.android.tools.r8.internal.tk:
     1:1:boolean com.android.tools.r8.graph.DexValue.isDexValueArray():0:0 -> a
-    1:1:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):178 -> a
-    2:6:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):181:185 -> a
-    7:7:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):179:179 -> a
-    8:27:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):55:74 -> a
-    28:34:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):69:75 -> a
-    35:41:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):61:61 -> a
-    47:47:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):67:67 -> a
-    48:73:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):89:114 -> a
-    74:415:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0:341 -> a
-    74:415:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    74:415:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    416:429:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):339:352 -> a
-    416:429:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    416:429:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    430:430:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):351:351 -> a
-    430:430:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    430:430:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    431:431:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):350:350 -> a
-    431:431:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    431:431:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    432:432:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):349:349 -> a
-    432:432:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    432:432:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    433:433:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):348:348 -> a
-    433:433:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    433:433:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    434:444:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):347:357 -> a
-    434:444:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    434:444:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    445:445:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):355:355 -> a
-    445:445:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
-    445:445:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):115 -> a
-    446:446:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):96:96 -> a
-    447:451:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):125:129 -> a
-    452:497:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):128:173 -> a
-    1:4:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):204:207 -> b
-    5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):205:205 -> b
+    1:1:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):189 -> a
+    2:6:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):192:196 -> a
+    7:7:int[] getUnboxedIntArray(com.android.tools.r8.graph.DexValue,java.lang.String):190:190 -> a
+    8:27:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):56:75 -> a
+    28:34:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):70:76 -> a
+    35:41:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):62:62 -> a
+    47:47:com.android.tools.r8.kotlin.KotlinClassLevelInfo getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer,com.android.tools.r8.graph.DexAnnotation):68:68 -> a
+    48:51:boolean isSyntheticClassifiedLambda(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata):82:85 -> a
+    52:77:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):100:125 -> a
+    78:419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0:341 -> a
+    78:419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    78:419:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    420:433:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):339:352 -> a
+    420:433:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    420:433:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    434:434:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):351:351 -> a
+    434:434:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    434:434:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    435:435:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):350:350 -> a
+    435:435:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    435:435:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    436:436:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):349:349 -> a
+    436:436:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    436:436:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    437:437:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):348:348 -> a
+    437:437:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    437:437:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    438:448:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):347:357 -> a
+    438:448:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    438:448:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    449:449:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Companion.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):355:355 -> a
+    449:449:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata.read(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader):0 -> a
+    449:449:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):126 -> a
+    450:450:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata toKotlinClassMetadata(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexEncodedAnnotation):107:107 -> a
+    451:455:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):136:140 -> a
+    456:501:com.android.tools.r8.kotlin.KotlinClassLevelInfo createKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):139:184 -> a
+    1:4:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):215:218 -> b
+    5:5:java.lang.String getUnboxedString(com.android.tools.r8.graph.DexValue,java.lang.String):216:216 -> b
     1:1:boolean com.android.tools.r8.graph.DexValue.isDexValueArray():0:0 -> c
-    1:1:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):191 -> c
-    2:6:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):194:198 -> c
-    7:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):192:192 -> c
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.gk$a:
-com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.gk$b:
-    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassMetadataReader$1):210:210 -> <init>
-    2:2:void <init>(java.lang.String):212:212 -> <init>
-com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.nk:
+    1:1:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):202 -> c
+    2:6:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):205:209 -> c
+    7:7:java.lang.String[] getUnboxedStringArray(com.android.tools.r8.graph.DexValue,java.lang.String):203:203 -> c
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$1 -> com.android.tools.r8.internal.tk$a:
+com.android.tools.r8.kotlin.KotlinClassMetadataReader$MetadataError -> com.android.tools.r8.internal.tk$b:
+    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassMetadataReader$1):221:221 -> <init>
+    2:2:void <init>(java.lang.String):223:223 -> <init>
+com.android.tools.r8.kotlin.KotlinClassifierInfo -> com.android.tools.r8.internal.Ak:
     1:1:void <init>():20:20 -> <init>
     void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens) -> a
     1:9:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):24:32 -> a
@@ -62821,44 +63183,44 @@
     24:25:com.android.tools.r8.kotlin.KotlinMetadataDiagnostic com.android.tools.r8.kotlin.KotlinMetadataDiagnostic.unknownClassifier(java.lang.String):53:54 -> a
     24:25:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44 -> a
     26:27:com.android.tools.r8.kotlin.KotlinClassifierInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClassifier,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):44:45 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.hk:
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.ik:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$1 -> com.android.tools.r8.internal.uk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinClassClassifierInfo -> com.android.tools.r8.internal.vk:
     boolean isLocalOrAnonymous -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,boolean,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):51:51 -> <init>
     2:4:void <init>(com.android.tools.r8.kotlin.KotlinTypeReference,boolean):56:58 -> <init>
     1:8:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):63:70 -> a
     9:9:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):76:76 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.jk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeAliasClassifierInfo -> com.android.tools.r8.internal.wk:
     java.lang.String typeAlias -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):99:99 -> <init>
     2:3:void <init>(java.lang.String):103:104 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):109:109 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.kk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinTypeParameterClassifierInfo -> com.android.tools.r8.internal.xk:
     int typeId -> a
     1:1:void <init>(int,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):80:80 -> <init>
     2:3:void <init>(int):84:85 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:90 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.lk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassClassifierInfo -> com.android.tools.r8.internal.yk:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):118:118 -> <init>
     2:3:void <init>(java.lang.String):121:122 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):127:127 -> a
-com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.mk:
+com.android.tools.r8.kotlin.KotlinClassifierInfo$KotlinUnknownClassifierInfo -> com.android.tools.r8.internal.zk:
     java.lang.String classifier -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinClassifierInfo$1):136:136 -> <init>
     2:3:void <init>(java.lang.String):139:140 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):145:145 -> a
-com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.ok:
+com.android.tools.r8.kotlin.KotlinCompanionInfo -> com.android.tools.r8.internal.Bk:
     1:1:void <init>():14:14 -> <init>
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-    boolean isCompanion() -> e
-    com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
-com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.pk:
+    boolean isCompanion() -> f
+    com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> g
+com.android.tools.r8.kotlin.KotlinConstructorInfo -> com.android.tools.r8.internal.Ck:
     java.util.List valueParameters -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> c
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo signature -> d
@@ -62876,9 +63238,9 @@
     37:41:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):61:65 -> a
     42:42:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinValueParameterInfo):80:80 -> a
     43:45:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:82 -> a
-    com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> c
+    com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> d
     boolean isConstructor() -> m
-com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.qk:
+com.android.tools.r8.kotlin.KotlinContractInfo -> com.android.tools.r8.internal.Dk:
     com.android.tools.r8.kotlin.KotlinContractInfo NO_EFFECT -> a
     java.util.List effects -> b
     1:1:void <clinit>():23:23 -> <clinit>
@@ -62890,7 +63252,7 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectInfo):49:49 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):49:49 -> a
     19:26:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmContractVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:63 -> a
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.sk:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo -> com.android.tools.r8.internal.Fk:
     java.util.List typeAliases -> b
     java.util.List propertiesWithNoBacking -> d
     java.util.List functionsWithNoBacking -> c
@@ -62919,7 +63281,7 @@
     142:142:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):216:216 -> a
     1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):186:186 -> b
     1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):217:217 -> c
-com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.rk:
+com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.Ek:
     com.android.tools.r8.graph.DexEncodedField backingField -> b
     com.android.tools.r8.graph.DexEncodedMethod getter -> d
     com.android.tools.r8.graph.DexEncodedMethod setter -> c
@@ -62932,7 +63294,7 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):220:220 -> b
     2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):237:238 -> b
     1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):220:220 -> c
-com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.tk:
+com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.Gk:
     java.util.List NO_EXPRESSIONS -> a
     java.lang.Integer parameterIndex -> d
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo NO_EXPRESSION -> b
@@ -62949,7 +63311,7 @@
     26:26:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):84:84 -> a
     27:44:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectExpressionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90:107 -> a
     1:1:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):85:85 -> b
-com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.uk:
+com.android.tools.r8.kotlin.KotlinEffectInfo -> com.android.tools.r8.internal.Hk:
     com.android.tools.r8.kotlin.KotlinEffectExpressionInfo conclusion -> d
     java.util.List constructorArguments -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectInvocationKind invocationKind -> b
@@ -62958,12 +63320,12 @@
     1:1:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinEffectExpressionInfo):50:50 -> a
     2:3:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):50:51 -> a
     4:9:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmEffectVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:60 -> a
-com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.vk:
-    com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> b
-    boolean isCompanion() -> e
-    com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> f
+com.android.tools.r8.kotlin.KotlinFieldLevelInfo -> com.android.tools.r8.internal.Ik:
+    com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> c
+    boolean isCompanion() -> f
+    com.android.tools.r8.kotlin.KotlinCompanionInfo asCompanion() -> g
     boolean isFieldProperty() -> l
-com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.wk:
+com.android.tools.r8.kotlin.KotlinFileFacadeInfo -> com.android.tools.r8.internal.Jk:
     int[] metadataVersion -> c
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> a
     java.lang.String packageName -> b
@@ -62972,9 +63334,9 @@
     4:4:com.android.tools.r8.kotlin.KotlinFileFacadeInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$FileFacade,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):43:43 -> a
     5:9:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):61:65 -> a
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):80:80 -> a
-    1:1:java.lang.String getPackageName():70:70 -> g
+    1:1:java.lang.String getPackageName():70:70 -> h
     1:1:int[] getMetadataVersion():75:75 -> n
-com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.xk:
+com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo -> com.android.tools.r8.internal.Kk:
     java.lang.String typeFlexibilityId -> k
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo NO_FLEXIBLE_UPPER_BOUND -> i
     boolean $assertionsDisabled -> j
@@ -62985,7 +63347,7 @@
     16:20:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):69:73 -> a
     21:21:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmFlexibleUpperBoundVisitorProvider,int):73:73 -> a
     22:25:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):78:81 -> a
-com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.yk:
+com.android.tools.r8.kotlin.KotlinFunctionInfo -> com.android.tools.r8.internal.Lk:
     com.android.tools.r8.kotlin.KotlinTypeReference lambdaClassOrigin -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo receiverParameterType -> e
     java.util.List typeParameters -> f
@@ -62998,7 +63360,6 @@
     int flags -> a
     com.android.tools.r8.kotlin.KotlinContractInfo contract -> j
     1:12:void <init>(int,java.lang.String,com.android.tools.r8.kotlin.KotlinTypeInfo,com.android.tools.r8.kotlin.KotlinTypeInfo,java.util.List,java.util.List,com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo,com.android.tools.r8.kotlin.KotlinTypeReference,com.android.tools.r8.kotlin.KotlinVersionRequirementInfo,com.android.tools.r8.kotlin.KotlinContractInfo,boolean):57:68 -> <init>
-    com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> a
     1:2:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):79:80 -> a
     3:44:boolean com.android.tools.r8.kotlin.KotlinValueParameterInfo.isCrossInline():0:41 -> a
     3:44:com.android.tools.r8.kotlin.KotlinFunctionInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):81 -> a
@@ -63020,17 +63381,18 @@
     112:112:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinValueParameterInfo):171:171 -> a
     113:125:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):171:183 -> a
     126:126:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):176:176 -> a
-    boolean isFunction() -> d
+    com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
+    boolean isFunction() -> e
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSignature():166:166 -> o
     1:1:boolean hasCrossInlineParameter():72:72 -> p
-com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.zk:
+com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo -> com.android.tools.r8.internal.Mk:
     java.lang.String name -> b
     com.android.tools.r8.kotlin.KotlinTypeReference type -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference):24:26 -> <init>
     1:3:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.graph.DexItemFactory):34:36 -> a
     4:14:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature rewrite(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):41:51 -> a
     15:15:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):56:56 -> a
-com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Ak:
+com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo -> com.android.tools.r8.internal.Nk:
     java.util.List EMPTY_PARAMETERS_LIST -> a
     java.lang.String invalidDescriptor -> f
     java.util.List parameters -> e
@@ -63045,7 +63407,7 @@
     41:46:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):118:123 -> a
     47:47:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):123:123 -> a
     1:13:java.lang.String toString():101:113 -> toString
-com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Bk:
+com.android.tools.r8.kotlin.KotlinLambdaInfo -> com.android.tools.r8.internal.Ok:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.kotlin.KotlinFunctionInfo function -> b
     boolean hasBacking -> c
@@ -63057,7 +63419,7 @@
     30:36:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73 -> a
     37:41:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmLambdaVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):72:76 -> a
     42:42:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):82:82 -> a
-com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.Ck:
+com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo -> com.android.tools.r8.internal.Pk:
     java.util.List propertyInfos -> c
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo EMPTY_DELEGATED_PROPERTIES -> a
     boolean $assertionsDisabled -> b
@@ -63068,7 +63430,9 @@
     17:17:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):52:52 -> a
     18:18:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:52 -> a
     19:20:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):57:58 -> a
-com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Dk:
+com.android.tools.r8.kotlin.KotlinMemberLevelInfo -> com.android.tools.r8.internal.Qk:
+    boolean isNoKotlinInformation() -> a
+com.android.tools.r8.kotlin.KotlinMetadataDiagnostic -> com.android.tools.r8.internal.Rk:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     java.lang.String message -> c
@@ -63076,7 +63440,7 @@
     1:1:java.lang.String getDiagnosticMessage():38:38 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():28:28 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():33:33 -> getPosition
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.Gk:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension -> com.android.tools.r8.internal.Uk:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexDefinitionSupplier definitionSupplier -> c
@@ -63084,7 +63448,7 @@
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set):31:33 -> <init>
     1:51:void done(com.android.tools.r8.shaking.Enqueuer):38:88 -> a
     52:59:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):51:58 -> a
-    60:64:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer):39:43 -> a
+    60:64:com.android.tools.r8.kotlin.KotlinClassLevelInfo com.android.tools.r8.kotlin.KotlinClassMetadataReader.getKotlinInfo(com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,boolean,java.util.function.Consumer):40:44 -> a
     60:64:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):54 -> a
     65:75:void lambda$done$1(boolean,com.android.tools.r8.shaking.Enqueuer,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexProgramClass):53:63 -> a
     76:76:void lambda$done$0(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod):60:60 -> a
@@ -63096,18 +63460,18 @@
     87:87:java.util.function.Consumer lambda$done$4(com.android.tools.r8.graph.DexEncodedField):94:94 -> a
     88:88:boolean verifyKotlinMetadataModeledForAllClasses(com.android.tools.r8.shaking.Enqueuer,boolean):100:100 -> a
     89:89:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103:103 -> a
-    90:91:boolean com.android.tools.r8.kotlin.KotlinClassMetadataReader.hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):82:83 -> a
+    90:91:boolean com.android.tools.r8.kotlin.KotlinClassMetadataReader.hasKotlinClassMetadataAnnotation(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexDefinitionSupplier):93:94 -> a
     90:91:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103 -> a
     92:96:void lambda$verifyKotlinMetadataModeledForAllClasses$6(boolean,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):103:103 -> a
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.Ek:
-com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Fk:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1 -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$KotlinMetadataDefinitionSupplier -> com.android.tools.r8.internal.Tk:
     com.android.tools.r8.graph.DexDefinitionSupplier baseSupplier -> a
     java.util.Set prunedTypes -> b
     1:1:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set,com.android.tools.r8.kotlin.KotlinMetadataEnqueuerExtension$1):111:111 -> <init>
     2:4:void <init>(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.Set):117:119 -> <init>
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():135:135 -> a
     1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):127:130 -> c
-com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Jk:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter -> com.android.tools.r8.internal.Xk:
     com.android.tools.r8.kotlin.Kotlin kotlin -> f
     com.android.tools.r8.graph.DexItemFactory factory -> e
     com.android.tools.r8.graph.AppView appView -> c
@@ -63152,12 +63516,12 @@
     149:153:com.android.tools.r8.graph.DexValue$DexValueArray createStringArray(java.lang.String[]):243:247 -> a
     154:163:int[] getMaxVersion(int[],int[]):252:261 -> a
     1:2:void runForR8(java.util.concurrent.ExecutorService):88:89 -> b
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     3:3:void runForR8(java.util.concurrent.ExecutorService):89 -> b
     4:15:void runForR8(java.util.concurrent.ExecutorService):90:101 -> b
     16:16:void runForR8(java.util.concurrent.ExecutorService):100:100 -> b
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.Hk:
-com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Ik:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$1 -> com.android.tools.r8.internal.Vk:
+com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo -> com.android.tools.r8.internal.Wk:
     boolean writeData2 -> e
     boolean writeExtraString -> f
     boolean writePackageName -> g
@@ -63170,7 +63534,7 @@
     2:10:void <init>(boolean,boolean,boolean,boolean,boolean,boolean,boolean,boolean):55:63 -> <init>
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo.rewriteAll():67:67 -> a
     1:1:com.android.tools.r8.kotlin.KotlinMetadataRewriter$WriteMetadataFieldInfo access$100():37 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.Ok:
+com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.cl:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
     1:2:void <clinit>():33:34 -> <clinit>
@@ -63183,8 +63547,8 @@
     15:22:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):81:88 -> a
     23:25:boolean isValidMethodDescriptor(java.lang.String):140:142 -> a
     26:34:boolean mayProcessKotlinMetadata(com.android.tools.r8.graph.AppView):157:165 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.Kk:
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.Nk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.Yk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.bl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature -> c
@@ -63199,27 +63563,27 @@
     3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():130:130 -> b
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):91:91 -> c
     2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():134:134 -> c
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.Mk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.al:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):100:100 -> <init>
     1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):103:106 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.Lk:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.Zk:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> d
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():106:106 -> <clinit>
     1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):106:106 -> <init>
     1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):113:118 -> a
-com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.Ok$a:
+com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.cl$a:
     java.lang.String name -> a
     1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):36:36 -> <init>
     2:3:void <init>(java.lang.String):41:42 -> <init>
+    boolean isNoKotlinInformation() -> a
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):52:52 -> a
-    1:1:java.lang.String getPackageName():57:57 -> g
-    boolean isNoKotlinInformation() -> j
+    1:1:java.lang.String getPackageName():57:57 -> h
     1:1:int[] getMetadataVersion():62:62 -> n
     1:1:java.lang.String toString():47:47 -> toString
-com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.Pk:
+com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.dl:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:1:java.util.List com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getLocalDelegatedProperties(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
@@ -63441,13 +63805,13 @@
     381:388:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):920:927 -> e
     389:402:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):921:934 -> e
     403:431:void lambda$appendKmEffectExpression$89(java.lang.StringBuilder,com.android.tools.r8.jetbrains.kotlinx.metadata.KmEffectExpression,java.lang.String):928:956 -> e
-com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.Qk:
-    com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> a
-    com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> c
-    boolean isFunction() -> d
-    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> h
+com.android.tools.r8.kotlin.KotlinMethodLevelInfo -> com.android.tools.r8.internal.el:
+    com.android.tools.r8.kotlin.KotlinFunctionInfo asFunction() -> b
+    com.android.tools.r8.kotlin.KotlinConstructorInfo asConstructor() -> d
+    boolean isFunction() -> e
+    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> i
     boolean isConstructor() -> m
-com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.Rk:
+com.android.tools.r8.kotlin.KotlinMultiFileClassFacadeInfo -> com.android.tools.r8.internal.fl:
     java.util.List partClassNames -> a
     int[] metadataVersion -> c
     java.lang.String packageName -> b
@@ -63476,9 +63840,9 @@
     385:385:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):68 -> a
     386:386:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeReference):83:83 -> a
     387:387:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
-    1:1:java.lang.String getPackageName():73:73 -> g
+    1:1:java.lang.String getPackageName():73:73 -> h
     1:1:int[] getMetadataVersion():78:78 -> n
-com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.Sk:
+com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo -> com.android.tools.r8.internal.gl:
     int[] metadataVersion -> d
     java.lang.String facadeClassName -> a
     com.android.tools.r8.kotlin.KotlinPackageInfo packageInfo -> b
@@ -63490,9 +63854,9 @@
     3:3:com.android.tools.r8.kotlin.KotlinMultiFileClassPartInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$MultiFileClassPart,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):50:50 -> a
     4:9:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):67:72 -> a
     10:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):87:87 -> a
-    1:1:java.lang.String getPackageName():77:77 -> g
+    1:1:java.lang.String getPackageName():77:77 -> h
     1:1:int[] getMetadataVersion():82:82 -> n
-com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.Uk:
+com.android.tools.r8.kotlin.KotlinPackageInfo -> com.android.tools.r8.internal.il:
     com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo containerInfo -> b
     java.lang.String moduleName -> a
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> c
@@ -63519,7 +63883,7 @@
     51:51:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer):60:60 -> a
     52:64:void rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):66:78 -> a
     65:66:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:84 -> a
-com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.Vk:
+com.android.tools.r8.kotlin.KotlinPropertyInfo -> com.android.tools.r8.internal.jl:
     com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo syntheticMethodForAnnotations -> n
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo versionRequirements -> i
     int jvmFlags -> j
@@ -63552,13 +63916,13 @@
     281:283:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):190 -> a
     284:295:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):192:203 -> a
     296:296:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):192:192 -> a
-    com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> b
-    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> h
+    com.android.tools.r8.kotlin.KotlinPropertyInfo asFieldProperty() -> c
+    com.android.tools.r8.kotlin.KotlinPropertyInfo asProperty() -> i
     boolean isFieldProperty() -> l
     1:1:com.android.tools.r8.kotlin.KotlinJvmFieldSignatureInfo getFieldSignature():132:132 -> o
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getGetterSignature():136:136 -> p
     1:1:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo getSetterSignature():140:140 -> q
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.Xk:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser -> com.android.tools.r8.internal.ll:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():22:22 -> <clinit>
     1:21:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parse(java.lang.String):113:133 -> a
@@ -63595,8 +63959,8 @@
     2:26:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
     27:34:void com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser.addDebugEntryToBuilder(java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder):239:246 -> b
     27:34:void lambda$parse$1(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder,java.util.List):160 -> b
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.Xk$a:
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.Xk$b:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1 -> com.android.tools.r8.internal.ll$a:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader -> com.android.tools.r8.internal.ll$b:
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> a
     java.lang.String readLine -> c
@@ -63610,25 +63974,25 @@
     1:1:java.lang.String readNextLine():49:49 -> b
     2:5:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$BufferedStringReader readUntil(java.lang.String):69:72 -> b
     1:1:void close():108:108 -> close
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.Xk$c:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$KotlinSourceDebugExtensionParserException -> com.android.tools.r8.internal.ll$c:
     1:1:void <init>(java.lang.String):34:34 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.Xk$d:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Position -> com.android.tools.r8.internal.ll$d:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source source -> a
     com.android.tools.r8.naming.Range range -> b
     1:3:void <init>(com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source,com.android.tools.r8.naming.Range):304:306 -> <init>
     1:1:com.android.tools.r8.naming.Range getRange():314:314 -> a
     1:1:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source getSource():310:310 -> b
     1:10:java.lang.String toString():319:328 -> toString
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.Xk$e:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result -> com.android.tools.r8.internal.ll$e:
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:2:void <init>(com.android.tools.r8.utils.SegmentTree):254:255 -> <init>
     1:1:java.util.Map$Entry lookup(int):259:259 -> a
     2:2:int size():263:263 -> a
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.internal.Xk$f:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$ResultBuilder -> com.android.tools.r8.internal.ll$f:
     java.util.Map files -> b
     com.android.tools.r8.utils.SegmentTree segmentTree -> a
     1:4:void <init>():267:270 -> <init>
-com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.Xk$g:
+com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Source -> com.android.tools.r8.internal.ll$g:
     java.lang.String fileName -> a
     java.lang.String path -> b
     1:1:void <init>(java.lang.String,java.lang.String,com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$1):277:277 -> <init>
@@ -63636,7 +64000,7 @@
     1:1:java.lang.String getFileName():287:287 -> a
     1:1:java.lang.String getPath():291:291 -> b
     1:1:java.lang.String toString():296:296 -> toString
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.Zk:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo -> com.android.tools.r8.internal.ml:
     com.android.tools.r8.kotlin.KotlinLambdaInfo lambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour flavour -> e
     int[] metadataVersion -> d
@@ -63645,31 +64009,29 @@
     1:1:void <clinit>():20:20 -> <clinit>
     1:5:void <init>(com.android.tools.r8.kotlin.KotlinLambdaInfo,com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour,java.lang.String,int[]):35:39 -> <init>
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda) -> a
-    1:6:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51:56 -> a
-    7:20:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour com.android.tools.r8.kotlin.KotlinSyntheticClassInfo.getFlavour(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):119:132 -> a
-    7:20:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):57 -> a
-    21:21:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):57:57 -> a
-    22:25:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):86:89 -> a
-    26:265:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):0:239 -> a
-    26:265:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
-    266:266:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):238:238 -> a
-    266:266:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
-    267:267:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):93:93 -> a
-    268:269:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):98:99 -> a
-    1:1:java.lang.String getPackageName():105:105 -> g
-    boolean isSyntheticClass() -> i
+    1:7:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):51:57 -> a
+    8:11:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):86:89 -> a
+    12:251:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):0:239 -> a
+    12:251:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
+    252:252:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambda.accept(com.android.tools.r8.jetbrains.kotlinx.metadata.KmLambdaVisitor):238:238 -> a
+    252:252:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):90 -> a
+    253:253:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassHeader rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):93:93 -> a
+    254:255:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):98:99 -> a
+    256:269:com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour getFlavour(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$SyntheticClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.kotlin.Kotlin):119:132 -> a
+    1:1:java.lang.String getPackageName():105:105 -> h
+    boolean isSyntheticClass() -> j
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo asSyntheticClass() -> k
     1:1:int[] getMetadataVersion():110:110 -> n
     1:1:boolean isJavaStyleLambda():71:71 -> o
     1:1:boolean isKotlinStyleLambda():67:67 -> p
     1:1:boolean isLambda():63:63 -> q
-com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.internal.Yk:
+com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour -> com.android.tools.r8.internal.ml$a:
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour Unclassified -> c
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour JavaStyleLambda -> b
     com.android.tools.r8.kotlin.KotlinSyntheticClassInfo$Flavour KotlinStyleLambda -> a
     1:3:void <clinit>():27:29 -> <clinit>
     1:1:void <init>(java.lang.String,int):26:26 -> <init>
-com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.al:
+com.android.tools.r8.kotlin.KotlinTypeAliasInfo -> com.android.tools.r8.internal.nl:
     com.android.tools.r8.kotlin.KotlinTypeInfo expandedType -> e
     java.util.List typeParameters -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo underlyingType -> d
@@ -63685,7 +64047,7 @@
     19:22:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):79:82 -> a
     23:23:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeParameterInfo):81:81 -> a
     24:24:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):82:82 -> a
-com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.bl:
+com.android.tools.r8.kotlin.KotlinTypeInfo -> com.android.tools.r8.internal.ol:
     java.util.List EMPTY_ARGUMENTS -> a
     com.android.tools.r8.kotlin.KotlinFlexibleTypeUpperBoundInfo flexibleTypeUpperBound -> h
     com.android.tools.r8.kotlin.KotlinTypeInfo outerType -> e
@@ -63703,7 +64065,7 @@
     40:49:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):112:121 -> a
     50:50:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeProjectionInfo):119:119 -> a
     51:51:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):121:121 -> a
-com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.cl:
+com.android.tools.r8.kotlin.KotlinTypeParameterInfo -> com.android.tools.r8.internal.pl:
     java.util.List EMPTY_UPPER_BOUNDS -> b
     java.util.List EMPTY_TYPE_PARAMETERS -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> f
@@ -63737,7 +64099,7 @@
     67:67:java.util.function.Consumer lambda$trace$0(com.android.tools.r8.kotlin.KotlinTypeInfo):108:108 -> a
     68:69:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):108:109 -> a
     70:70:java.util.function.Consumer lambda$trace$1(com.android.tools.r8.kotlin.KotlinAnnotationInfo):109:109 -> a
-com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.dl:
+com.android.tools.r8.kotlin.KotlinTypeProjectionInfo -> com.android.tools.r8.internal.ql:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance variance -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo typeInfo -> b
     1:3:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVariance,com.android.tools.r8.kotlin.KotlinTypeInfo):22:24 -> <init>
@@ -63747,7 +64109,7 @@
     5:7:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeStarProjectionVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):44:46 -> a
     8:8:com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor lambda$rewrite$0(com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeProjectionVisitorProvider,int):46:46 -> a
     9:10:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):52:53 -> a
-com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.el:
+com.android.tools.r8.kotlin.KotlinTypeReference -> com.android.tools.r8.internal.rl:
     com.android.tools.r8.graph.DexType known -> b
     boolean $assertionsDisabled -> a
     java.lang.String unknown -> c
@@ -63768,7 +64130,7 @@
     1:5:com.android.tools.r8.kotlin.KotlinTypeReference fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):47 -> b
     6:19:java.lang.String toRenamedDescriptorOrDefault(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,java.lang.String):61:74 -> b
     1:1:java.lang.String toString():98:98 -> toString
-com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.fl:
+com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.sl:
     java.util.List EMPTY_VALUE_PARAMETERS -> a
     com.android.tools.r8.kotlin.KotlinTypeInfo varargElementType -> e
     com.android.tools.r8.kotlin.KotlinTypeInfo type -> d
@@ -63780,14 +64142,14 @@
     7:14:java.util.List create(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):59:66 -> a
     15:18:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmValueParameterVisitorProvider,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):73:76 -> a
     19:21:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:85 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.hl:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo -> com.android.tools.r8.internal.ul:
     java.util.List versionRequirements -> b
     com.android.tools.r8.kotlin.KotlinVersionRequirementInfo NO_VERSION_REQUIREMENTS -> a
     1:2:void <clinit>():17:18 -> <clinit>
     1:2:void <init>(java.util.List):22:23 -> <init>
     1:8:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo create(java.util.List):27:34 -> a
     9:13:void rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmVersionRequirementVisitorProvider):38:42 -> a
-com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.gl:
+com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint -> com.android.tools.r8.internal.tl:
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementLevel level -> c
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVersionKind kind -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersion version -> e
@@ -63798,7 +64160,7 @@
     1:5:com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint access$000(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirement):46 -> a
     6:8:void com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint.rewrite(com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):77:79 -> a
     6:8:void access$100(com.android.tools.r8.kotlin.KotlinVersionRequirementInfo$KotlinVersionRequirementPoint,com.android.tools.r8.jetbrains.kotlinx.metadata.KmVersionRequirementVisitor):46 -> a
-com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.Vm:
+com.android.tools.r8.logging.Log -> com.android.tools.r8.internal.in:
     java.util.Set CLASS_FILTER -> b
     boolean ENABLED -> a
     1:1:void <clinit>():12:12 -> <clinit>
@@ -63944,7 +64306,7 @@
     73:80:void registerClassAsUsed(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString):193:200 -> a
     81:86:void registerPackagePrefixesAsUsed(java.lang.String,boolean):211:216 -> a
     87:93:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):239:245 -> a
-    94:94:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    94:94:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     94:94:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):245 -> a
     95:103:com.android.tools.r8.graph.DexString computeName(com.android.tools.r8.graph.DexType):246:254 -> a
     104:120:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForOuterClass(com.android.tools.r8.graph.DexType,java.lang.String):301:317 -> a
@@ -63953,7 +64315,7 @@
     124:128:java.lang.String getParentPackagePrefix(java.lang.String):405:409 -> a
     1:1:com.android.tools.r8.naming.ClassNameMinifier$ClassNamingStrategy access$200(com.android.tools.r8.naming.ClassNameMinifier):36:36 -> b
     2:2:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):221:221 -> b
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     3:3:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):221 -> b
     4:8:com.android.tools.r8.graph.DexType getOutClassForType(com.android.tools.r8.graph.DexType):230:234 -> b
     9:26:com.android.tools.r8.naming.ClassNameMinifier$Namespace getStateForPackagePrefix(java.lang.String):278:295 -> b
@@ -63966,7 +64328,7 @@
     391:391:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForClass$1(java.lang.String):272:272 -> c
     1:1:java.util.Set access$500(com.android.tools.r8.naming.ClassNameMinifier):36:36 -> d
     2:6:void renameDanglingType(com.android.tools.r8.graph.DexType):177:181 -> d
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> d
     7:7:void renameDanglingType(com.android.tools.r8.graph.DexType):181 -> d
     8:10:void renameDanglingType(com.android.tools.r8.graph.DexType):181:183 -> d
     11:11:com.android.tools.r8.naming.ClassNameMinifier$Namespace lambda$getStateForPackagePrefix$2(java.lang.String):285:285 -> d
@@ -64136,7 +64498,7 @@
     1:8:com.android.tools.r8.naming.ClassNamingForNameMapper$MappedRange firstRangeForLine(int):153:160 -> b
     1:7:boolean equals(java.lang.Object):218:224 -> equals
     1:1:int hashCode():229:229 -> hashCode
-com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.M8:
+com.android.tools.r8.naming.DictionaryReader -> com.android.tools.r8.internal.V8:
     java.nio.file.Path path -> c
     java.io.BufferedReader reader -> b
     boolean $assertionsDisabled -> a
@@ -64166,7 +64528,7 @@
     26:26:void com.android.tools.r8.naming.ReservedFieldNamingState.markReservedDirectly(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexType):31:31 -> a
     26:26:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):108 -> a
     27:37:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):111:121 -> a
-    38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    38:38:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     38:38:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):121 -> a
     39:41:void lambda$reserveFieldNames$1(com.android.tools.r8.graph.DexClass):123:125 -> a
     42:45:void lambda$reserveFieldNames$2(com.android.tools.r8.graph.DexClasspathClass):136:139 -> a
@@ -64178,10 +64540,10 @@
     52:53:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):154:155 -> a
     54:54:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
     54:54:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):155 -> a
-    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    55:55:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):347 -> a
+    55:55:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    55:55:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
     55:55:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):155 -> a
-    56:56:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):348:348 -> a
+    56:56:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):353:353 -> a
     56:56:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):155 -> a
     57:58:void lambda$propagateReservedFieldNamesUpwards$3(com.android.tools.r8.graph.DexProgramClass):156:157 -> a
     59:63:void lambda$renameFieldsInClasses$6(java.util.Map,com.android.tools.r8.graph.DexClass):171:175 -> a
@@ -64193,7 +64555,7 @@
     82:82:com.android.tools.r8.naming.ReservedFieldNamingState getReservedFieldNamingState(com.android.tools.r8.graph.DexType):87:87 -> a
     82:82:void renameFieldsInInterfacePartition(java.util.Set):203 -> a
     83:113:void renameFieldsInInterfacePartition(java.util.Set):205:235 -> a
-    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    114:114:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     114:114:void renameFieldsInInterfacePartition(java.util.Set):235 -> a
     115:116:void renameFieldsInInterfacePartition(java.util.Set):237:238 -> a
     117:119:com.android.tools.r8.graph.DexString renameField(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.FieldNamingState):245:247 -> a
@@ -64217,7 +64579,7 @@
     2:2:com.android.tools.r8.naming.FieldNamingState lambda$renameFieldsInClasses$4(com.android.tools.r8.graph.DexType):178 -> c
     3:5:void renameNonReboundReferences():253:255 -> c
     1:37:void reserveFieldNames():97:133 -> d
-    38:38:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReferencedClasspathClass(java.util.function.Consumer):1265:1265 -> d
+    38:38:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReferencedClasspathClass(java.util.function.Consumer):1325:1325 -> d
     38:38:void reserveFieldNames():134 -> d
     39:39:void reserveFieldNames():144:144 -> d
 com.android.tools.r8.naming.FieldNameMinifier$1 -> com.android.tools.r8.naming.h:
@@ -64237,7 +64599,7 @@
     1:1:java.util.List access$100(com.android.tools.r8.naming.FieldNameMinifier$InterfacePartitioning,java.util.Collection):278:278 -> a
     2:9:java.util.List sortedPartitions(java.util.Collection):290:297 -> a
     10:18:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):304:312 -> a
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     19:19:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):312 -> a
     20:40:java.util.Set buildSortedPartition(com.android.tools.r8.graph.DexClass):317:337 -> a
     41:41:int lambda$buildSortedPartition$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):304:304 -> a
@@ -64320,134 +64682,142 @@
     38:38:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):176 -> b
     39:50:void replaceDexItemBasedConstStringInMethod(com.android.tools.r8.graph.DexEncodedMethod):177:188 -> b
     1:4:void run(java.util.concurrent.ExecutorService):49:52 -> c
-com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.uc:
+com.android.tools.r8.naming.IdentifierNameStringMarker -> com.android.tools.r8.internal.Ec:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo throwingInfo -> d
-    1:1:void <clinit>():52:52 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.AppView):58:61 -> <init>
+    1:1:void <clinit>():53:53 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.AppView):59:62 -> <init>
     boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$1(com.android.tools.r8.ir.code.ConstString,com.android.tools.r8.ir.code.Instruction) -> a
     boolean lambda$decoupleIdentifierNameStringForInvokeInstruction$2(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Instruction) -> a
-    1:3:void decoupleIdentifierNameStringsInFields(java.util.concurrent.ExecutorService):66:66 -> a
-    4:4:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):69:69 -> a
-    5:17:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):78:90 -> a
-    5:17:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):70 -> a
-    18:18:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):89:89 -> a
-    18:18:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):70 -> a
-    19:49:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):99:129 -> a
-    50:50:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):128:128 -> a
-    51:51:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):125:125 -> a
-    52:52:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):140:140 -> a
-    52:52:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):124 -> a
+    1:3:void decoupleIdentifierNameStringsInFields(java.util.concurrent.ExecutorService):67:67 -> a
+    4:4:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):70:70 -> a
+    5:17:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):79:91 -> a
+    5:17:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):71 -> a
+    18:18:void com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringInStaticField(com.android.tools.r8.graph.DexEncodedField):90:90 -> a
+    18:18:void lambda$decoupleIdentifierNameStringsInFields$0(com.android.tools.r8.graph.DexProgramClass):71 -> a
+    19:49:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):100:130 -> a
+    50:50:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):129:129 -> a
+    51:51:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):126:126 -> a
+    52:52:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):141:141 -> a
+    52:52:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):125 -> a
     53:53:com.android.tools.r8.ir.code.FieldInstruction com.android.tools.r8.ir.code.FieldInstruction.asFieldInstruction():0:0 -> a
-    53:53:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):141 -> a
-    53:53:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):124 -> a
-    54:104:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):142:192 -> a
-    54:104:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):124 -> a
-    105:106:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):202:203 -> a
-    107:279:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):0:172 -> a
-    107:279:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):203 -> a
-    280:393:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):204:317 -> a
-    394:396:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):210:212 -> a
-    397:398:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):335:336 -> a
-    397:398:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    399:400:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):171:172 -> a
-    399:400:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):336 -> a
-    399:400:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    401:407:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):337:343 -> a
-    401:407:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    408:417:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):342:351 -> a
-    408:417:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    418:418:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):350:350 -> a
-    418:418:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):216 -> a
-    419:422:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):217:220 -> a
-    423:423:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
-    423:423:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):220 -> a
-    424:441:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):225:242 -> a
-    442:442:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
-    442:442:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    443:443:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):24:24 -> a
-    443:443:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
-    443:443:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):242 -> a
-    444:523:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):245:324 -> a
-    524:530:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):323:329 -> a
-    531:531:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):115:115 -> a
-    531:531:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328 -> a
-    532:532:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):327:327 -> a
-    533:533:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):325:325 -> a
-    534:558:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):360:384 -> a
-com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.vc:
+    53:53:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):142 -> a
+    53:53:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):125 -> a
+    54:104:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.naming.IdentifierNameStringMarker.decoupleIdentifierNameStringForFieldPutInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.FieldInstruction):143:193 -> a
+    54:104:void decoupleIdentifierNameStringsInBlocks(com.android.tools.r8.ir.code.IRCode,java.util.Set):125 -> a
+    105:106:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):203:204 -> a
+    107:283:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):0:176 -> a
+    107:283:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):204 -> a
+    284:401:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):205:322 -> a
+    402:405:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):211:214 -> a
+    406:407:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):340:341 -> a
+    406:407:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
+    408:409:boolean com.android.tools.r8.naming.IdentifierNameStringUtils.isClassNameComparison(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexItemFactory):175:176 -> a
+    408:409:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):341 -> a
+    408:409:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
+    410:416:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):342:348 -> a
+    410:416:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
+    417:426:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):347:356 -> a
+    417:426:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
+    427:427:int com.android.tools.r8.naming.IdentifierNameStringMarker.getIdentifierPositionInArguments(com.android.tools.r8.ir.code.InvokeMethod):355:355 -> a
+    427:427:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):218 -> a
+    428:431:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):219:222 -> a
+    432:432:boolean com.android.tools.r8.ir.code.Instruction.isDexItemBasedConstString():0:0 -> a
+    432:432:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):222 -> a
+    433:453:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):227:247 -> a
+    454:454:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304:304 -> a
+    454:454:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
+    455:455:void com.android.tools.r8.ir.code.InstructionListIterator.replaceCurrentInstruction(com.android.tools.r8.ir.code.Instruction):31:31 -> a
+    455:455:void com.android.tools.r8.ir.code.Instruction.replace(com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.IRCode):304 -> a
+    455:455:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):247 -> a
+    456:535:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):250:329 -> a
+    536:542:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):328:334 -> a
+    543:543:com.android.tools.r8.ir.code.Invoke com.android.tools.r8.ir.code.Invoke.create(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexProto,com.android.tools.r8.ir.code.Value,java.util.List):115:115 -> a
+    543:543:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):333 -> a
+    544:544:com.android.tools.r8.ir.code.InstructionListIterator decoupleIdentifierNameStringForInvokeInstruction(com.android.tools.r8.ir.code.IRCode,java.util.ListIterator,com.android.tools.r8.ir.code.InstructionListIterator,com.android.tools.r8.ir.code.InvokeMethod):332:332 -> a
+    545:545:com.android.tools.r8.ir.code.Value lambda$decoupleIdentifierNameStringForInvokeInstruction$3(com.android.tools.r8.ir.code.Value[],com.android.tools.r8.ir.code.Value,long):330:330 -> a
+    546:570:void warnUndeterminedIdentifierIfNecessary(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexString):365:389 -> a
+com.android.tools.r8.naming.IdentifierNameStringUtils -> com.android.tools.r8.internal.Hc:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():37:37 -> <clinit>
+    1:1:void <clinit>():41:41 -> <clinit>
     boolean lambda$evaluateTypeArrayContentFromConstructionToUse$0(com.android.tools.r8.ir.code.NewArrayEmpty,com.android.tools.r8.ir.code.Instruction) -> a
-    1:89:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):69:157 -> a
-    90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):110:116 -> a
-    97:99:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):176:178 -> a
-    100:105:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):182:187 -> a
-    106:106:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1227:1227 -> a
-    106:106:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):187 -> a
-    107:124:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):201:218 -> a
-    125:132:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):310:317 -> a
-    125:132:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):217 -> a
-    133:133:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    133:133:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):318 -> a
-    133:133:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):217 -> a
-    134:134:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):319:319 -> a
-    134:134:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):217 -> a
-    135:155:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):224:244 -> a
-    156:156:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    156:156:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):244 -> a
-    157:172:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):248:263 -> a
-    173:174:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):523:524 -> a
-    173:174:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    175:175:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    175:175:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):525 -> a
-    175:175:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    176:178:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):525:527 -> a
-    176:178:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    179:179:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    179:179:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):527 -> a
-    179:179:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    180:194:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):528:542 -> a
-    180:194:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    195:195:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    195:195:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):542 -> a
-    195:195:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    196:215:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):542:561 -> a
-    196:215:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    216:222:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):560:566 -> a
-    216:222:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):263 -> a
-    223:223:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):267:267 -> a
-    224:227:com.android.tools.r8.graph.DexReference com.android.tools.r8.naming.IdentifierNameStringUtils.inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):389:392 -> a
-    224:227:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):267 -> a
-    228:230:com.android.tools.r8.graph.DexReference identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier):269:271 -> a
-    231:234:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):277:280 -> a
-    235:237:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):301:303 -> a
-    238:271:com.android.tools.r8.graph.DexReference com.android.tools.r8.naming.IdentifierNameStringUtils.inferMemberFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):327:360 -> a
-    238:271:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):291 -> a
-    272:274:com.android.tools.r8.graph.DexReference com.android.tools.r8.naming.IdentifierNameStringUtils.inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):378:380 -> a
-    272:274:com.android.tools.r8.graph.DexReference com.android.tools.r8.naming.IdentifierNameStringUtils.inferMemberFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):362 -> a
-    272:274:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):291 -> a
-    275:275:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):294:294 -> a
-    276:279:com.android.tools.r8.graph.DexReference inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):368:371 -> a
-    280:307:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):421:448 -> a
-    308:308:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
-    308:308:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):449 -> a
-    309:324:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):449:464 -> a
-    325:328:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):400:403 -> a
-    325:328:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):464 -> a
-    329:329:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
-    329:329:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):403 -> a
-    329:329:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):464 -> a
-    330:332:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):404:406 -> a
-    330:332:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):464 -> a
-    333:333:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
-    333:333:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):406 -> a
-    333:333:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):464 -> a
-    334:336:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):407:407 -> a
-    334:336:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):464 -> a
-    337:352:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):469:484 -> a
+    1:89:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):73:161 -> a
+    90:96:boolean isReflectionMethod(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod):114:120 -> a
+    97:99:boolean isClassNameComparison(com.android.tools.r8.ir.code.InvokeVirtual,com.android.tools.r8.graph.DexItemFactory):180:182 -> a
+    100:105:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):186:191 -> a
+    106:106:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
+    106:106:boolean isClassNameValue(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):191 -> a
+    107:115:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):205:213 -> a
+    116:128:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):212:224 -> a
+    129:136:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):322:329 -> a
+    129:136:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):223 -> a
+    137:137:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    137:137:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):330 -> a
+    137:137:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):223 -> a
+    138:138:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.inferTypeFromConstStringValue(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.ir.code.Value):331:331 -> a
+    138:138:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):223 -> a
+    139:161:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):222:244 -> a
+    162:162:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):35:35 -> a
+    162:162:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):249 -> a
+    163:172:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):253:262 -> a
+    173:178:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):261:266 -> a
+    179:183:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):265:269 -> a
+    184:185:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):535:536 -> a
+    184:185:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    186:186:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    186:186:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):537 -> a
+    186:186:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    187:189:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):537:539 -> a
+    187:189:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    190:190:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    190:190:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):539 -> a
+    190:190:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    191:205:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):540:554 -> a
+    191:205:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    206:206:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    206:206:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):554 -> a
+    206:206:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    207:226:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):554:573 -> a
+    207:226:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    227:233:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.naming.IdentifierNameStringUtils.retrieveDexTypeListFromClassList(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):572:578 -> a
+    227:233:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):269 -> a
+    234:234:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):274:274 -> a
+    235:238:com.android.tools.r8.graph.DexMethod com.android.tools.r8.naming.IdentifierNameStringUtils.inferMethodInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexTypeList):401:404 -> a
+    235:238:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):274 -> a
+    239:244:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):273:278 -> a
+    245:245:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    245:245:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):278 -> a
+    246:246:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):280:280 -> a
+    247:251:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):279:283 -> a
+    252:252:com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult identifyIdentifier(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):282:282 -> a
+    253:256:int getPositionOfFirstConstString(com.android.tools.r8.ir.code.Instruction):289:292 -> a
+    257:259:com.android.tools.r8.graph.DexType inferTypeFromNameString(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexString):313:315 -> a
+    260:293:com.android.tools.r8.graph.DexMember com.android.tools.r8.naming.IdentifierNameStringUtils.inferMemberFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):339:372 -> a
+    260:293:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):303 -> a
+    294:296:com.android.tools.r8.graph.DexMethod com.android.tools.r8.naming.IdentifierNameStringUtils.inferMethodNameInHolder(com.android.tools.r8.graph.DexClass,java.lang.String):390:392 -> a
+    294:296:com.android.tools.r8.graph.DexMember com.android.tools.r8.naming.IdentifierNameStringUtils.inferMemberFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):374 -> a
+    294:296:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):303 -> a
+    297:297:com.android.tools.r8.graph.DexReference inferMemberOrTypeFromNameString(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexString):306:306 -> a
+    298:301:com.android.tools.r8.graph.DexField inferFieldInHolder(com.android.tools.r8.graph.DexClass,java.lang.String,com.android.tools.r8.graph.DexType):380:383 -> a
+    302:329:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):433:460 -> a
+    330:330:boolean com.android.tools.r8.ir.code.Instruction.isCheckCast():0:0 -> a
+    330:330:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):461 -> a
+    331:346:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):461:476 -> a
+    347:350:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):412:415 -> a
+    347:350:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):476 -> a
+    351:351:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> a
+    351:351:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):415 -> a
+    351:351:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):476 -> a
+    352:354:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):416:418 -> a
+    352:354:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):476 -> a
+    355:355:boolean com.android.tools.r8.ir.code.Instruction.isStaticGet():0:0 -> a
+    355:355:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):418 -> a
+    355:355:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):476 -> a
+    356:358:com.android.tools.r8.graph.DexType com.android.tools.r8.naming.IdentifierNameStringUtils.getTypeFromConstClassOrBoxedPrimitive(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexItemFactory):419:419 -> a
+    356:358:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):476 -> a
+    359:374:com.android.tools.r8.graph.DexType[] evaluateTypeArrayContentFromConstructionToUse(com.android.tools.r8.ir.code.NewArrayEmpty,java.util.List,int,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.DexItemFactory):481:496 -> a
 com.android.tools.r8.naming.InterfaceMethodNameMinifier -> com.android.tools.r8.naming.q:
     com.android.tools.r8.naming.MethodNameMinifier$State minifierState -> e
     com.android.tools.r8.graph.AppView appView -> b
@@ -64489,7 +64859,7 @@
     239:245:void assignNamesToInterfaceMethods(com.android.tools.r8.utils.Timing,java.util.Collection):594:600 -> a
     246:246:com.android.tools.r8.naming.InterfaceMethodNameMinifier$InterfaceMethodGroupState lambda$assignNamesToInterfaceMethods$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):427:427 -> a
     247:274:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):449:476 -> a
-    275:275:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    275:275:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     275:275:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):476 -> a
     276:285:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):477:486 -> a
     286:299:void lambda$assignNamesToInterfaceMethods$2(com.android.tools.r8.utils.DisjointSets,com.android.tools.r8.graph.DexCallSite):485:498 -> a
@@ -64713,7 +65083,7 @@
     2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):85:85 -> a
     3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):85:85 -> a
     4:4:java.util.function.Function getNamingKeyTransform():159:159 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     5:5:java.util.function.Function getNamingKeyTransform():159 -> a
     6:7:java.util.function.Function getNamingKeyTransform():160:161 -> a
     8:8:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):180:180 -> a
@@ -64721,7 +65091,7 @@
     9:12:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):181 -> a
     13:29:com.android.tools.r8.naming.MethodNameMinifier$MethodRenaming computeRenaming(java.util.Collection,com.android.tools.r8.utils.Timing):182:198 -> a
     30:36:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):202:208 -> a
-    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    37:37:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     37:37:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):208 -> a
     38:39:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):209:210 -> a
     40:53:void assignNameToMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.MethodNamingState):221:234 -> a
@@ -64729,7 +65099,7 @@
     54:55:void assignNamesToClassesMethods(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodNamingState):214:215 -> a
     56:56:com.android.tools.r8.naming.MethodNamingState lambda$assignNamesToClassesMethods$3(com.android.tools.r8.naming.MethodNamingState,com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):207:207 -> a
     57:66:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):265:274 -> a
-    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    67:67:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     67:67:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):274 -> a
     68:68:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276:276 -> a
     69:69:java.lang.Iterable shuffleMethods(java.lang.Iterable,com.android.tools.r8.utils.InternalOptions):330:330 -> a
@@ -64737,7 +65107,7 @@
     70:73:com.android.tools.r8.naming.MethodReservationState allocateReservationStateAndReserve(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):276:279 -> a
     74:74:com.android.tools.r8.naming.MethodReservationState lambda$allocateReservationStateAndReserve$4(com.android.tools.r8.naming.MethodReservationState,com.android.tools.r8.graph.DexType):272:272 -> a
     75:81:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):288:294 -> a
-    82:82:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    82:82:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     82:82:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):294 -> a
     83:85:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):296:298 -> a
     86:96:com.android.tools.r8.naming.MethodReservationState findReservationStateInHierarchy(com.android.tools.r8.graph.DexType):312:322 -> a
@@ -64745,12 +65115,12 @@
     97:99:com.android.tools.r8.naming.MethodNamingState getOrAllocateMethodNamingStates(com.android.tools.r8.graph.DexType):304:306 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):85:85 -> b
     2:3:java.util.function.Function getReservationKeyTransform():148:149 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> b
     4:4:java.util.function.Function getReservationKeyTransform():149 -> b
     5:8:java.util.function.Function getReservationKeyTransform():151:154 -> b
     9:9:java.lang.Object lambda$getReservationKeyTransform$0(com.android.tools.r8.graph.DexMethod):151:151 -> b
     10:18:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):246:254 -> b
-    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    19:19:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     19:19:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):254 -> b
     20:23:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):255:258 -> b
     24:24:void reserveNamesInClasses(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):256:256 -> b
@@ -64874,13 +65244,13 @@
     1:1:void <clinit>():38:38 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
     1:2:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):47:48 -> a
-    3:1363:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():0:1360 -> a
-    3:1363:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):48 -> a
-    1364:1375:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):49:60 -> a
-    1376:1376:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming com.android.tools.r8.naming.ClassNameMinifier.computeRenaming(com.android.tools.r8.utils.Timing):103:103 -> a
-    1376:1376:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
-    1377:1404:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:89 -> a
-    1405:1405:int lambda$run$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):50:50 -> a
+    3:1423:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():0:1420 -> a
+    3:1423:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):48 -> a
+    1424:1435:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):49:60 -> a
+    1436:1436:com.android.tools.r8.naming.ClassNameMinifier$ClassRenaming com.android.tools.r8.naming.ClassNameMinifier.computeRenaming(com.android.tools.r8.utils.Timing):103:103 -> a
+    1436:1436:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):61 -> a
+    1437:1464:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):62:89 -> a
+    1465:1465:int lambda$run$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):50:50 -> a
 com.android.tools.r8.naming.Minifier$BaseMinificationNamingStrategy -> com.android.tools.r8.naming.E$a:
     java.util.List obfuscationDictionary -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing mixedCasing -> d
@@ -64927,7 +65297,7 @@
     22:22:com.android.tools.r8.graph.DexString getReservedName(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexClass):258:258 -> a
     23:23:boolean allowMemberRenaming(com.android.tools.r8.graph.DexClass):279:279 -> a
     1:1:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):283:283 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
     2:2:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):283 -> c
     3:3:boolean checkAllowMemberRenaming(com.android.tools.r8.graph.DexType):284:284 -> c
 com.android.tools.r8.naming.NamingLens -> com.android.tools.r8.naming.F:
@@ -64988,7 +65358,7 @@
     1:9:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):203:211 -> b
     10:11:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.NamingLens.lookupClassDescriptor(com.android.tools.r8.graph.DexType):49:50 -> b
     10:11:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):212 -> b
-    12:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():56:56 -> b
+    12:12:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexType.getDescriptor():61:61 -> b
     12:12:com.android.tools.r8.graph.DexString lookupDescriptor(com.android.tools.r8.graph.DexType):204 -> b
 com.android.tools.r8.naming.PrefixRewritingNamingLens -> com.android.tools.r8.naming.G:
     com.android.tools.r8.graph.AppView appView -> f
@@ -65042,87 +65412,87 @@
     2:15:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.SeedMapper):74:87 -> <init>
     1:1:int lambda$new$0(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):76:76 -> a
     2:2:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):91:91 -> a
-    3:1363:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():0:1360 -> a
-    3:1363:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):92 -> a
-    1364:1381:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):94:111 -> a
-    1382:1382:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReferencedClasspathClass(java.util.function.Consumer):1265:1265 -> a
-    1382:1382:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):111 -> a
-    1383:1387:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):112:116 -> a
-    1388:1388:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    1388:1388:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):116 -> a
-    1389:1392:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124:127 -> a
-    1393:1404:void computeDefaultInterfaceMethodMethods():334:345 -> a
-    1393:1404:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    1405:2202:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:797 -> a
-    1405:2202:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
-    1405:2202:void computeDefaultInterfaceMethodMethods():345 -> a
-    1405:2202:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2203:2204:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:365 -> a
-    2203:2204:void computeDefaultInterfaceMethodMethods():345 -> a
-    2203:2204:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2205:2205:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2205:2205:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
-    2205:2205:void computeDefaultInterfaceMethodMethods():345 -> a
-    2205:2205:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2206:2206:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    2206:2206:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366 -> a
-    2206:2206:void computeDefaultInterfaceMethodMethods():345 -> a
-    2206:2206:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2207:2219:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:381 -> a
-    2207:2219:void computeDefaultInterfaceMethodMethods():345 -> a
-    2207:2219:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2220:2224:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):380:384 -> a
-    2220:2224:void computeDefaultInterfaceMethodMethods():345 -> a
-    2220:2224:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2225:2225:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):383:383 -> a
-    2225:2225:void computeDefaultInterfaceMethodMethods():345 -> a
-    2225:2225:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
-    2226:2272:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:175 -> a
-    2273:2278:void lambda$run$2(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,java.util.Set,com.android.tools.r8.graph.DexClass):101:106 -> a
-    2279:2279:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119:119 -> a
-    2280:2280:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2280:2280:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119 -> a
-    2281:2282:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):120:121 -> a
-    2283:2284:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):185:186 -> a
-    2285:2285:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2285:2285:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):186 -> a
-    2286:2295:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):189:198 -> a
-    2296:2303:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):320:327 -> a
-    2296:2303:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
-    2304:2304:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):326:326 -> a
-    2304:2304:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
-    2305:2309:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):325:329 -> a
-    2305:2309:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
-    2310:2318:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):199:207 -> a
-    2319:2334:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):204:219 -> a
-    2335:2344:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):218:227 -> a
-    2345:2358:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):222:235 -> a
-    2359:2379:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):234:254 -> a
-    2380:2380:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    2380:2380:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):254 -> a
-    2381:2383:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):257:259 -> a
-    2384:2384:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    2384:2384:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):259 -> a
-    2385:2385:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):256:256 -> a
-    2386:2392:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):267:273 -> a
-    2393:2393:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2393:2393:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):273 -> a
-    2394:2394:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):275:275 -> a
-    2395:2395:void lambda$addNonPrivateInterfaceMappings$7(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):271:271 -> a
-    2396:2401:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:290 -> a
-    2402:2404:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):289:291 -> a
-    2405:2494:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    2405:2494:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):291 -> a
-    2495:2502:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):292:299 -> a
-    2503:2505:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):298:300 -> a
-    2506:2595:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    2506:2595:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300 -> a
-    2596:2596:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):301:301 -> a
-    2597:2597:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> a
-    2597:2597:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
-    2598:2598:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:303 -> a
-    2599:2601:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):310:310 -> a
-    2603:2606:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):312:315 -> a
+    3:1423:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():0:1420 -> a
+    3:1423:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):92 -> a
+    1424:1441:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):94:111 -> a
+    1442:1442:void com.android.tools.r8.shaking.AppInfoWithLiveness.forEachReferencedClasspathClass(java.util.function.Consumer):1325:1325 -> a
+    1442:1442:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):111 -> a
+    1443:1447:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):112:116 -> a
+    1448:1448:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    1448:1448:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):116 -> a
+    1449:1452:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):124:127 -> a
+    1453:1464:void computeDefaultInterfaceMethodMethods():334:345 -> a
+    1453:1464:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    1465:2282:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:817 -> a
+    1465:2282:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):361 -> a
+    1465:2282:void computeDefaultInterfaceMethodMethods():345 -> a
+    1465:2282:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2283:2284:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):364:365 -> a
+    2283:2284:void computeDefaultInterfaceMethodMethods():345 -> a
+    2283:2284:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2285:2285:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    2285:2285:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):365 -> a
+    2285:2285:void computeDefaultInterfaceMethodMethods():345 -> a
+    2285:2285:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2286:2286:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    2286:2286:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):366 -> a
+    2286:2286:void computeDefaultInterfaceMethodMethods():345 -> a
+    2286:2286:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2287:2299:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):369:381 -> a
+    2287:2299:void computeDefaultInterfaceMethodMethods():345 -> a
+    2287:2299:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2300:2304:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):380:384 -> a
+    2300:2304:void computeDefaultInterfaceMethodMethods():345 -> a
+    2300:2304:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2305:2305:void computeDefaultInterfaceMethodMappingsForType(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.ClassNamingForMapApplier,java.util.Map,java.util.Map):383:383 -> a
+    2305:2305:void computeDefaultInterfaceMethodMethods():345 -> a
+    2305:2305:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):128 -> a
+    2306:2352:com.android.tools.r8.naming.NamingLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):129:175 -> a
+    2353:2358:void lambda$run$2(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,java.util.Set,com.android.tools.r8.graph.DexClass):101:106 -> a
+    2359:2359:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119:119 -> a
+    2360:2360:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    2360:2360:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):119 -> a
+    2361:2362:void lambda$run$3(java.util.ArrayDeque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):120:121 -> a
+    2363:2364:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):185:186 -> a
+    2365:2365:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    2365:2365:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):186 -> a
+    2366:2375:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):189:198 -> a
+    2376:2383:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):320:327 -> a
+    2376:2383:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    2384:2384:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):326:326 -> a
+    2384:2384:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    2385:2389:void checkAndAddMappedNames(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexString,com.android.tools.r8.position.Position):325:329 -> a
+    2385:2389:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):198 -> a
+    2390:2398:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):199:207 -> a
+    2399:2414:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):204:219 -> a
+    2415:2424:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):218:227 -> a
+    2425:2438:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):222:235 -> a
+    2439:2459:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):234:254 -> a
+    2460:2460:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    2460:2460:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):254 -> a
+    2461:2463:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):257:259 -> a
+    2464:2464:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
+    2464:2464:void computeMapping(com.android.tools.r8.graph.DexType,java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo):259 -> a
+    2465:2465:void lambda$computeMapping$5(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):256:256 -> a
+    2466:2472:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):267:273 -> a
+    2473:2473:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    2473:2473:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):273 -> a
+    2474:2474:void addNonPrivateInterfaceMappings(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.graph.DexType[]):275:275 -> a
+    2475:2475:void lambda$addNonPrivateInterfaceMappings$7(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):271:271 -> a
+    2476:2481:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):285:290 -> a
+    2482:2484:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):289:291 -> a
+    2485:2574:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    2485:2574:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):291 -> a
+    2575:2582:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):292:299 -> a
+    2583:2585:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):298:300 -> a
+    2586:2675:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    2586:2675:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):300 -> a
+    2676:2676:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):301:301 -> a
+    2677:2677:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():180:180 -> a
+    2677:2677:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):302 -> a
+    2678:2678:void addMemberNamings(com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MemberNaming,java.util.Map,boolean):303:303 -> a
+    2679:2681:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):310:310 -> a
+    2683:2686:void addMemberNaming(com.android.tools.r8.graph.DexReference,com.android.tools.r8.naming.MemberNaming,java.util.Map):312:315 -> a
     1:1:int lambda$run$1(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):98:98 -> b
     2:2:void lambda$computeMapping$4(com.android.tools.r8.graph.DexType,java.util.Map,com.android.tools.r8.naming.MemberNaming):200:200 -> b
     3:3:void lambda$computeMapping$6(java.util.Deque,java.util.Set,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexType):261:261 -> b
@@ -65146,11 +65516,11 @@
     1:2:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):467:468 -> a
     3:92:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
     3:92:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):468 -> a
-    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     93:93:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):89 -> a
     93:93:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):468 -> a
     94:108:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):469:483 -> a
-    109:109:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
+    109:109:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
     109:109:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):483 -> a
     110:110:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):483:483 -> a
     111:122:com.android.tools.r8.graph.DexString next(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.naming.InternalNamingState,java.util.function.BiPredicate):492:503 -> a
@@ -65322,7 +65692,7 @@
     java.lang.String msg -> d
     1:5:void <init>(com.android.tools.r8.naming.ProguardMapReader,java.lang.String,boolean):541:545 -> <init>
     1:4:java.lang.String toString():550:553 -> toString
-com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.wt:
+com.android.tools.r8.naming.ProguardMapSupplier -> com.android.tools.r8.internal.Rt:
     com.android.tools.r8.naming.ClassNameMapper classNameMapper -> c
     com.android.tools.r8.utils.InternalOptions options -> e
     com.android.tools.r8.utils.Reporter reporter -> f
@@ -65343,8 +65713,8 @@
     31:31:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():66 -> a
     32:32:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():67:67 -> a
     1:1:com.android.tools.r8.StringConsumer access$200(com.android.tools.r8.naming.ProguardMapSupplier):20:20 -> b
-com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.wt$a:
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.wt$b:
+com.android.tools.r8.naming.ProguardMapSupplier$1 -> com.android.tools.r8.internal.Rt$a:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker -> com.android.tools.r8.internal.Rt$b:
     boolean $assertionsDisabled -> a
     com.android.tools.r8.StringConsumer inner -> b
     java.lang.StringBuilder contents -> c
@@ -65357,23 +65727,23 @@
     3:5:boolean com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapChecker.validateProguardMapParses(java.lang.String):163:165 -> finished
     3:5:void finished(com.android.tools.r8.DiagnosticsHandler):158 -> finished
     6:6:void finished(com.android.tools.r8.DiagnosticsHandler):158:158 -> finished
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.wt$c:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId -> com.android.tools.r8.internal.Rt$c:
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():33:33 -> <clinit>
     1:1:void <init>(java.lang.String,com.android.tools.r8.naming.ProguardMapSupplier$1):33:33 -> <init>
     2:4:void <init>(java.lang.String):35:37 -> <init>
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.wt$d:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder -> com.android.tools.r8.internal.Rt$d:
     com.android.tools.r8.com.google.common.hash.Hasher hasher -> a
     1:3:void <init>():107:109 -> <init>
     1:4:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapIdBuilder.accept(java.lang.String):113:116 -> a
     1:4:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):107 -> a
     5:5:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId build():123:123 -> a
-com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.wt$e:
+com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter -> com.android.tools.r8.internal.Rt$e:
     com.android.tools.r8.naming.ProguardMapSupplier this$0 -> a
     1:1:void <init>(com.android.tools.r8.naming.ProguardMapSupplier):127:127 -> <init>
     1:1:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapWriter.accept(java.lang.String):131:131 -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):127 -> a
-com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.tv:
+com.android.tools.r8.naming.Range -> com.android.tools.r8.internal.Ov:
     int to -> b
     int from -> a
     1:3:void <init>(int,int):12:14 -> <init>
@@ -65443,7 +65813,7 @@
     118:119:com.android.tools.r8.naming.ClassNamingForMapApplier$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):57:58 -> a
     118:119:com.android.tools.r8.naming.ClassNaming$Builder classNamingBuilder(java.lang.String,java.lang.String,com.android.tools.r8.position.Position):39 -> a
     120:121:com.android.tools.r8.naming.SeedMapper build():65:66 -> a
-com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.vy:
+com.android.tools.r8.naming.SourceFileRewriter -> com.android.tools.r8.internal.Oy:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DexApplication application -> c
@@ -65452,12 +65822,12 @@
     1:11:void run():33:43 -> a
     12:14:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):86:88 -> a
     12:14:void run():46 -> a
-    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    15:15:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     15:15:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):88 -> a
     15:15:void run():46 -> a
     16:34:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):91:109 -> a
     16:34:void run():46 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     35:35:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):109 -> a
     35:35:void run():46 -> a
     36:36:com.android.tools.r8.graph.DexString com.android.tools.r8.naming.SourceFileRewriter.getSourceFileRenaming(com.android.tools.r8.shaking.ProguardConfiguration):109:109 -> a
@@ -65466,7 +65836,7 @@
     48:66:void lambda$run$2(com.android.tools.r8.graph.DexEncodedMethod):59:77 -> a
     67:67:boolean lambda$run$0(com.android.tools.r8.graph.DexDebugEvent):74:74 -> a
     68:68:com.android.tools.r8.graph.DexDebugEvent[] lambda$run$1(int):75:75 -> a
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.F5:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo -> com.android.tools.r8.internal.J5:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping mapping -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo CANONICAL_NAME_INSTANCE -> a
     int arrayDepth -> f
@@ -65507,7 +65877,7 @@
     1:1:com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo none():139:139 -> e
     1:5:boolean equals(java.lang.Object):174:178 -> equals
     1:1:int hashCode():183:183 -> hashCode
-com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.E5:
+com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping -> com.android.tools.r8.internal.I5:
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NONE -> a
     boolean $assertionsDisabled -> g
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo$ClassNameMapping NAME -> b
@@ -65524,7 +65894,7 @@
     52:52:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):63:63 -> a
     53:53:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):54:54 -> a
     54:92:com.android.tools.r8.graph.DexString map(java.lang.String,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexItemFactory,int):46:84 -> a
-com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.za:
+com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo -> com.android.tools.r8.internal.Ia:
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo FIELD_NAME_INSTANCE -> a
     1:1:void <clinit>():15:15 -> <clinit>
     1:1:void <init>():18:18 -> <init>
@@ -65532,7 +65902,7 @@
     boolean needsToComputeName() -> c
     boolean needsToRegisterReference() -> d
     1:1:com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo forFieldName():21:21 -> e
-com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.vp:
+com.android.tools.r8.naming.dexitembasedstring.NameComputationInfo -> com.android.tools.r8.internal.Hp:
     1:1:void <init>():13:13 -> <init>
     com.android.tools.r8.naming.dexitembasedstring.ClassNameComputationInfo asClassNameComputationInfo() -> a
     1:2:com.android.tools.r8.graph.DexString computeNameFor(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens):20:21 -> a
@@ -65548,6 +65918,59 @@
     com.android.tools.r8.naming.dexitembasedstring.FieldNameComputationInfo asFieldNameComputationInfo() -> b
     boolean needsToComputeName() -> c
     boolean needsToRegisterReference() -> d
+com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.h5:
+    1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():561:561 -> a
+    1:1:boolean isTypeInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
+    boolean isTypeInitializedFromUse() -> d
+com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult -> com.android.tools.r8.internal.H5:
+    1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
+    boolean isTypeInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
+    boolean isTypeInitializedFromUse() -> d
+com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.O8:
+    1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
+com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult -> com.android.tools.r8.internal.T8:
+    1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
+    boolean isTypeInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
+    boolean isTypeInitializedFromUse() -> d
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringLookupResult -> com.android.tools.r8.internal.Dc:
+    boolean $assertionsDisabled -> a
+    com.android.tools.r8.graph.DexReference reference -> b
+    1:1:void <clinit>():13:13 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.DexReference):17:19 -> <init>
+    com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult asTypeResult() -> a
+    1:1:com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult fromClassForName(com.android.tools.r8.graph.DexType):23:23 -> a
+    2:2:java.lang.Object com.android.tools.r8.utils.FunctionUtils.applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):14:14 -> a
+    2:2:com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult fromClassForName(com.android.tools.r8.graph.DexType):23 -> a
+    3:3:com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult fromClassForName(com.android.tools.r8.graph.DexType):23:23 -> a
+    4:4:com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult fromDexMemberBasedConstString(com.android.tools.r8.graph.DexMember):38:38 -> a
+    5:5:java.lang.Object com.android.tools.r8.utils.FunctionUtils.applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):14:14 -> a
+    5:5:com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult fromDexMemberBasedConstString(com.android.tools.r8.graph.DexMember):38 -> a
+    6:6:com.android.tools.r8.naming.identifiernamestring.DexMemberBasedConstStringIdentifierNameStringLookupResult fromDexMemberBasedConstString(com.android.tools.r8.graph.DexMember):38:38 -> a
+    1:1:com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult fromClassNameComparison(com.android.tools.r8.graph.DexType):28:28 -> b
+    2:2:java.lang.Object com.android.tools.r8.utils.FunctionUtils.applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):14:14 -> b
+    2:2:com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult fromClassNameComparison(com.android.tools.r8.graph.DexType):28 -> b
+    3:3:com.android.tools.r8.naming.identifiernamestring.ClassNameComparisonIdentifierNameStringLookupResult fromClassNameComparison(com.android.tools.r8.graph.DexType):28:28 -> b
+    4:4:com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult fromUncategorized(com.android.tools.r8.graph.DexMember):44:44 -> b
+    5:5:java.lang.Object com.android.tools.r8.utils.FunctionUtils.applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):14:14 -> b
+    5:5:com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult fromUncategorized(com.android.tools.r8.graph.DexMember):44 -> b
+    6:6:com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult fromUncategorized(com.android.tools.r8.graph.DexMember):44:44 -> b
+    7:7:com.android.tools.r8.graph.DexReference getReference():56:56 -> b
+    boolean isTypeResult() -> c
+    1:1:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33:33 -> c
+    2:2:java.lang.Object com.android.tools.r8.utils.FunctionUtils.applyOrElse(java.lang.Object,java.util.function.Function,java.lang.Object):14:14 -> c
+    2:2:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33 -> c
+    3:3:com.android.tools.r8.naming.identifiernamestring.DexTypeBasedConstStringIdentifierNameStringLookupResult fromDexTypeBasedConstString(com.android.tools.r8.graph.DexType):33:33 -> c
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringMemberLookupResult -> com.android.tools.r8.internal.Fc:
+    1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
+com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult -> com.android.tools.r8.internal.Gc:
+    1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
+    com.android.tools.r8.naming.identifiernamestring.IdentifierNameStringTypeLookupResult asTypeResult() -> a
+    boolean isTypeInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions) -> a
+    boolean isTypeResult() -> c
+    boolean isTypeInitializedFromUse() -> d
+com.android.tools.r8.naming.identifiernamestring.UncategorizedMemberIdentifierNameStringLookupResult -> com.android.tools.r8.internal.nC:
+    1:1:void <init>(com.android.tools.r8.graph.DexMember):13:13 -> <init>
 com.android.tools.r8.naming.mappinginformation.FileNameInformation -> com.android.tools.r8.naming.mappinginformation.a:
     java.lang.String fileName -> b
     1:2:void <init>(java.lang.String):20:21 -> <init>
@@ -65658,20 +66081,20 @@
     com.android.tools.r8.naming.mappinginformation.SignatureMappingInformation asSignatureMappingInformation() -> b
     boolean isSignatureMappingInformation() -> d
     com.android.tools.r8.naming.MemberNaming$Signature getSignature() -> f
-com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Fb:
+com.android.tools.r8.naming.signature.GenericSignatureAction -> com.android.tools.r8.internal.Ob:
     void parsedIdentifier(java.lang.String) -> a
     java.lang.Object parsedInnerTypeName(java.lang.Object,java.lang.String) -> a
     void parsedSymbol(char) -> a
     java.lang.Object parsedTypeName(java.lang.String,com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition) -> a
     void stop() -> a
     void start() -> b
-com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Fb$a:
+com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition -> com.android.tools.r8.internal.Ob$a:
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition MEMBER_ANNOTATION -> c
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition ENCLOSING_INNER_OR_TYPE_ANNOTATION -> b
     com.android.tools.r8.naming.signature.GenericSignatureAction$ParserPosition CLASS_SUPER_OR_INTERFACE_ANNOTATION -> a
     1:3:void <clinit>():15:17 -> <clinit>
     1:1:void <init>(java.lang.String,int):14:14 -> <init>
-com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Gb:
+com.android.tools.r8.naming.signature.GenericSignatureParser -> com.android.tools.r8.internal.Pb:
     com.android.tools.r8.naming.signature.GenericSignatureAction actions -> b
     char[] buffer -> f
     boolean eof -> e
@@ -65715,7 +66138,7 @@
     1:11:void updateOptTypeArguments():252:262 -> f
     1:13:void updateTypeArgument():268:280 -> g
     1:9:void updateTypeVariableSignature():286:294 -> h
-com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Hb:
+com.android.tools.r8.naming.signature.GenericSignatureRewriter -> com.android.tools.r8.internal.Qb:
     com.android.tools.r8.graph.AppView appView -> a
     com.android.tools.r8.naming.NamingLens namingLens -> b
     com.android.tools.r8.utils.InternalOptions options -> c
@@ -65726,45 +66149,47 @@
     18:18:void lambda$run$0(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedField):51:51 -> a
     19:19:void lambda$run$1(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedMethod):56:56 -> a
     20:20:void lambda$run$1(com.android.tools.r8.graph.GenericSignatureTypeRewriter,com.android.tools.r8.graph.DexEncodedMethod):55:55 -> a
-com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.f5:
-    com.android.tools.r8.graph.DexApplication application -> a
-    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> c
-    com.android.tools.r8.graph.AppView appView -> b
-    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> e
-    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> d
-    com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder lensBuilder -> f
-    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):48:48 -> <init>
-    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):43:53 -> <init>
-    1:1:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):72:72 -> a
-    2:12:com.android.tools.r8.graph.GraphLens com.android.tools.r8.optimize.ClassAndMemberPublicizer.run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):78:88 -> a
-    2:12:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):73 -> a
-    13:14:void doPublicize(com.android.tools.r8.graph.ProgramDefinition):92:93 -> a
+com.android.tools.r8.optimize.ClassAndMemberPublicizer -> com.android.tools.r8.internal.g5:
+    com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> d
+    com.android.tools.r8.graph.DexApplication application -> b
+    com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> e
+    com.android.tools.r8.graph.AppView appView -> c
+    com.android.tools.r8.ir.optimize.MethodPoolCollection methodPoolCollection -> f
+    com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder lensBuilder -> g
+    boolean $assertionsDisabled -> a
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):52:52 -> <init>
+    2:12:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):47:57 -> <init>
+    1:1:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):76:76 -> a
+    2:12:com.android.tools.r8.graph.GraphLens com.android.tools.r8.optimize.ClassAndMemberPublicizer.run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):82:92 -> a
+    2:12:com.android.tools.r8.graph.GraphLens run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):77 -> a
+    13:14:void doPublicize(com.android.tools.r8.graph.ProgramDefinition):96:97 -> a
     15:459:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):0:444 -> a
-    15:459:void doPublicize(com.android.tools.r8.graph.ProgramDefinition):93 -> a
-    460:460:void lambda$doPublicize$0(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):94:94 -> a
-    461:465:void publicizeType(com.android.tools.r8.graph.DexType):98:102 -> a
+    15:459:void doPublicize(com.android.tools.r8.graph.ProgramDefinition):97 -> a
+    460:460:void lambda$doPublicize$0(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):98:98 -> a
+    461:465:void publicizeType(com.android.tools.r8.graph.DexType):102:106 -> a
     466:466:void com.android.tools.r8.graph.SubtypingInfo.forAllImmediateExtendsSubtypes(com.android.tools.r8.graph.DexType,java.util.function.Consumer):212:212 -> a
-    466:466:void publicizeType(com.android.tools.r8.graph.DexType):102 -> a
-    467:504:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):106:143 -> a
-    505:505:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):141:141 -> a
-    506:506:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):111:111 -> a
-    507:507:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> a
-    507:507:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):112 -> a
-    508:508:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):115:115 -> a
-    509:509:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> a
-    509:509:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):118 -> a
-    510:510:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):122:122 -> a
-    511:517:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):148:154 -> a
-    511:517:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):129 -> a
-    518:518:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> a
-    518:518:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
-    518:518:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):129 -> a
-    519:555:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):162:198 -> a
-    519:555:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):129 -> a
-    556:556:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):165:165 -> a
-    556:556:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):129 -> a
-    557:557:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):130:130 -> a
-com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Ea:
+    466:466:void publicizeType(com.android.tools.r8.graph.DexType):106 -> a
+    467:504:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):110:147 -> a
+    505:505:void publicizeClass(com.android.tools.r8.graph.DexProgramClass):145:145 -> a
+    506:506:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):115:115 -> a
+    507:507:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():188:188 -> a
+    507:507:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):116 -> a
+    508:508:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):119:119 -> a
+    509:509:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():180:180 -> a
+    509:509:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):122 -> a
+    510:510:void lambda$publicizeClass$1(com.android.tools.r8.graph.ProgramField):126:126 -> a
+    511:517:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):152:158 -> a
+    511:517:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    518:518:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():488:488 -> a
+    518:518:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):161 -> a
+    518:518:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    519:571:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):166:218 -> a
+    519:571:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    572:572:boolean com.android.tools.r8.optimize.ClassAndMemberPublicizer.publicizeMethod(com.android.tools.r8.graph.ProgramMethod):167:167 -> a
+    572:572:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):133 -> a
+    573:573:void lambda$publicizeClass$2(java.util.Set,com.android.tools.r8.graph.ProgramMethod):134:134 -> a
+com.android.tools.r8.optimize.FieldRebindingIdentityLens -> com.android.tools.r8.internal.Na:
     boolean $assertionsDisabled -> f
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> g
     1:1:void <clinit>():23:23 -> <clinit>
@@ -65786,15 +66211,15 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():110:110 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.Ca:
-com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Da:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$1 -> com.android.tools.r8.internal.La:
+com.android.tools.r8.optimize.FieldRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Ma:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> a
     1:1:void <init>(com.android.tools.r8.optimize.FieldRebindingIdentityLens$1):113:113 -> <init>
     2:2:void <init>():118:118 -> <init>
     3:3:void <init>():115:115 -> <init>
     1:1:void recordDefinitionForNonReboundFieldReference(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):122:122 -> a
     2:3:com.android.tools.r8.optimize.FieldRebindingIdentityLens build(com.android.tools.r8.graph.DexItemFactory):129:130 -> a
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.zg:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor -> com.android.tools.r8.internal.Mg:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind kind -> d
     com.android.tools.r8.graph.DexMethod target -> e
     boolean $assertionsDisabled -> c
@@ -65811,23 +66236,23 @@
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):65 -> b
     2:2:com.android.tools.r8.graph.DexMethod getTarget():36:36 -> b
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> c
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):75 -> c
-    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):60:60 -> c
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):45 -> c
+    2:2:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> c
+    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):75 -> c
+    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):60:60 -> c
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> d
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):45 -> d
+    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):105 -> d
     2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):70:70 -> d
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> e
-    1:1:void registerInstanceOf(com.android.tools.r8.graph.DexType):105 -> e
+    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):85 -> e
     2:2:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> e
     2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):90 -> e
     3:3:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):50:50 -> e
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> f
-    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):85 -> f
+    1:1:void registerTypeReference(com.android.tools.r8.graph.DexType):100 -> f
     1:1:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):95 -> g
-    2:2:void com.android.tools.r8.optimize.InvokeSingleTargetExtractor.invalid():32:32 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):100 -> g
-com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.yg:
+com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind -> com.android.tools.r8.internal.Lg:
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind ILLEGAL -> d
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind NONE -> e
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind STATIC -> b
@@ -65835,7 +66260,7 @@
     com.android.tools.r8.optimize.InvokeSingleTargetExtractor$InvokeKind VIRTUAL -> a
     1:5:void <clinit>():109:113 -> <clinit>
     1:1:void <init>(java.lang.String,int):108:108 -> <init>
-com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.Tn:
+com.android.tools.r8.optimize.MemberRebindingAnalysis -> com.android.tools.r8.internal.fo:
     com.android.tools.r8.optimize.MemberRebindingLens$Builder lensBuilder -> e
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.utils.InternalOptions options -> d
@@ -65845,7 +66270,7 @@
     1:6:void <init>(com.android.tools.r8.graph.AppView):43:48 -> <init>
     1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.optimize.MemberRebindingAnalysis):35:35 -> a
     2:2:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):52:52 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     3:3:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):52 -> a
     4:18:com.android.tools.r8.graph.DexMethod validTargetFor(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):53:67 -> a
     19:19:com.android.tools.r8.graph.DexField validMemberRebindingTargetFor(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.DexClassAndField,com.android.tools.r8.graph.DexField):72:72 -> a
@@ -65867,15 +66292,15 @@
     67:79:void computeMethodRebinding(com.android.tools.r8.graph.MethodAccessInfoCollection):143:155 -> a
     80:80:void computeMethodRebinding(com.android.tools.r8.utils.BiForEachable,java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type):163:163 -> a
     81:84:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):167:170 -> a
-    85:85:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    85:85:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     85:85:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):170 -> a
     86:95:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):171:180 -> a
-    96:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    96:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     96:96:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):180 -> a
     97:97:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):181:181 -> a
     98:98:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):211:211 -> a
     98:98:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):188 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     99:99:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):211 -> a
     99:99:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):188 -> a
     100:103:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.code.Invoke$Type):211:214 -> a
@@ -65888,21 +66313,21 @@
     114:122:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):200 -> a
     123:125:void lambda$computeMethodRebinding$1(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):204:204 -> a
     126:129:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):242:245 -> a
-    130:130:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    130:130:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     130:130:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):245 -> a
     131:135:com.android.tools.r8.graph.DexProgramClass findHolderForInterfaceMethodBridge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):247:251 -> a
     136:137:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):255:256 -> a
     136:137:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):198 -> a
-    138:138:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    138:138:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     138:138:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):256 -> a
     138:138:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):198 -> a
     139:145:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.mayNeedBridgeForVisibility(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexEncodedMethod):260:266 -> a
     139:145:boolean lambda$computeMethodRebinding$0(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):198 -> a
     146:152:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):296:302 -> a
-    153:153:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    153:153:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     153:153:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):302 -> a
     154:158:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):303:307 -> a
-    159:159:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    159:159:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     159:159:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):307 -> a
     160:170:com.android.tools.r8.graph.DexProgramClass findHolderForVisibilityBridge(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,java.lang.String):308:318 -> a
     171:172:void lambda$verifyFieldAccessCollectionContainsAllNonReboundFieldReferences$3(java.util.Set,com.android.tools.r8.graph.FieldAccessInfo):346:347 -> a
@@ -65917,28 +66342,28 @@
     1:1:com.android.tools.r8.graph.DexEncodedMethod interfaceLookup(com.android.tools.r8.graph.DexMethod):134:134 -> c
     2:6:com.android.tools.r8.optimize.MemberRebindingLens run(java.util.concurrent.ExecutorService):332:336 -> c
     1:18:boolean verifyFieldAccessCollectionContainsAllNonReboundFieldReferences(java.util.concurrent.ExecutorService):341:358 -> d
-com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.Sn:
+com.android.tools.r8.optimize.MemberRebindingAnalysis$1 -> com.android.tools.r8.internal.eo:
     java.util.Set val$nonReboundFieldReferences -> c
     com.android.tools.r8.optimize.MemberRebindingAnalysis this$0 -> d
     1:1:void <init>(com.android.tools.r8.optimize.MemberRebindingAnalysis,com.android.tools.r8.graph.DexItemFactory,java.util.Set):370:370 -> <init>
     void registerInvokeDirect(com.android.tools.r8.graph.DexMethod) -> a
     1:1:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):374:374 -> a
     void registerInvokeInterface(com.android.tools.r8.graph.DexMethod) -> b
+    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
     void registerInvokeStatic(com.android.tools.r8.graph.DexMethod) -> c
     1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):379:379 -> c
-    void registerInitClass(com.android.tools.r8.graph.DexType) -> d
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
     void registerInvokeSuper(com.android.tools.r8.graph.DexMethod) -> d
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> e
     void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod) -> e
+    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):384:384 -> e
-    void registerNewInstance(com.android.tools.r8.graph.DexType) -> f
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):389:389 -> g
     1:4:void registerFieldReference(com.android.tools.r8.graph.DexField):393:396 -> i
-    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> i
+    5:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> i
     5:5:void registerFieldReference(com.android.tools.r8.graph.DexField):396 -> i
     6:6:void registerFieldReference(com.android.tools.r8.graph.DexField):397:397 -> i
-com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.Wn:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens -> com.android.tools.r8.internal.io:
     boolean $assertionsDisabled -> f
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> g
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> h
@@ -65964,8 +66389,8 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():128:128 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.Un:
-com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.Vn:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$1 -> com.android.tools.r8.internal.go:
+com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder -> com.android.tools.r8.internal.ho:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> b
     java.util.Map nonReboundMethodReferenceToDefinitionMap -> c
     com.android.tools.r8.graph.AppView appView -> a
@@ -65979,7 +66404,7 @@
     4:13:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):155:164 -> a
     14:14:void recordMethodAccess(com.android.tools.r8.graph.DexMethod):163:163 -> a
     15:19:com.android.tools.r8.optimize.MemberRebindingIdentityLens build():173:177 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.Yn:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory -> com.android.tools.r8.internal.ko:
     1:45:com.android.tools.r8.optimize.MemberRebindingIdentityLens$Builder com.android.tools.r8.optimize.MemberRebindingIdentityLens.builder(com.android.tools.r8.graph.AppView):0:44 -> a
     1:45:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.MethodAccessInfoCollection):72 -> a
     46:48:com.android.tools.r8.optimize.MemberRebindingIdentityLens create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollection,com.android.tools.r8.graph.MethodAccessInfoCollection):73:75 -> a
@@ -65987,9 +66412,9 @@
     68:71:void initializeMemberAccessInfoCollectionsForMemberRebinding(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.concurrent.ExecutorService):88:91 -> a
     72:72:void initializeMemberAccessInfoCollectionsForMemberRebinding(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.concurrent.ExecutorService):90:90 -> a
     73:73:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):93:93 -> a
-    74:74:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):21:21 -> a
+    74:74:void com.android.tools.r8.graph.UseRegistry.accept(com.android.tools.r8.graph.ProgramMethod):23:23 -> a
     74:74:void lambda$initializeMemberAccessInfoCollectionsForMemberRebinding$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection$ConcurrentBuilder,java.util.Set,java.util.Set,com.android.tools.r8.graph.ProgramMethod):100 -> a
-com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.Xn:
+com.android.tools.r8.optimize.MemberRebindingIdentityLensFactory$NonReboundMemberReferencesRegistry -> com.android.tools.r8.internal.jo:
     com.android.tools.r8.graph.ProgramMethod context -> e
     java.util.Set seenFieldReferences -> h
     java.util.Set seenMethodReferences -> i
@@ -66006,18 +66431,18 @@
     10:45:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):212 -> a
     46:58:void registerInvokeMethod(com.android.tools.r8.graph.DexMethod,java.util.Map):216:228 -> a
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):187:187 -> b
+    void registerInitClass(com.android.tools.r8.graph.DexType) -> c
     1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):136:136 -> c
     2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):192:192 -> c
-    void registerInitClass(com.android.tools.r8.graph.DexType) -> d
+    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> d
     1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):197:197 -> d
-    void registerInstanceOf(com.android.tools.r8.graph.DexType) -> e
+    void registerNewInstance(com.android.tools.r8.graph.DexType) -> e
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):141:141 -> e
     2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):202:202 -> e
-    void registerNewInstance(com.android.tools.r8.graph.DexType) -> f
-    void registerTypeReference(com.android.tools.r8.graph.DexType) -> g
+    void registerTypeReference(com.android.tools.r8.graph.DexType) -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):146:146 -> g
     1:9:void registerFieldAccess(com.android.tools.r8.graph.DexField):150:158 -> i
-    10:10:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> i
+    10:10:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> i
     10:10:void registerFieldAccess(com.android.tools.r8.graph.DexField):158 -> i
     11:16:void registerFieldAccess(com.android.tools.r8.graph.DexField):163:168 -> i
     17:17:boolean com.android.tools.r8.graph.AbstractAccessContexts.isBottom():0:0 -> i
@@ -66026,7 +66451,7 @@
     21:21:boolean com.android.tools.r8.graph.AbstractAccessContexts.isConcrete():0:0 -> i
     21:21:void registerFieldAccess(com.android.tools.r8.graph.DexField):171 -> i
     22:28:void registerFieldAccess(com.android.tools.r8.graph.DexField):171:177 -> i
-com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.bo:
+com.android.tools.r8.optimize.MemberRebindingLens -> com.android.tools.r8.internal.no:
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> i
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.AppView appView -> g
@@ -66059,8 +66484,8 @@
     com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType) -> e
     1:1:boolean isContextFreeForMethods():88:88 -> e
     com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod) -> f
-com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.Zn:
-com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.ao:
+com.android.tools.r8.optimize.MemberRebindingLens$1 -> com.android.tools.r8.internal.lo:
+com.android.tools.r8.optimize.MemberRebindingLens$Builder -> com.android.tools.r8.internal.mo:
     java.util.Map methodMaps -> c
     java.util.Map nonReboundFieldReferenceToDefinitionMap -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -66075,7 +66500,7 @@
     11:11:void com.android.tools.r8.optimize.MemberRebindingLens$Builder.recordNonReboundFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):178:178 -> a
     11:11:void lambda$recordNonReboundFieldAccesses$1(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):173 -> a
     12:12:com.android.tools.r8.optimize.MemberRebindingLens build():182:182 -> a
-com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.rv:
+com.android.tools.r8.optimize.PublicizerLens -> com.android.tools.r8.internal.Mv:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Set publicizedMethods -> o
@@ -66086,12 +66511,12 @@
     1:2:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):50:51 -> a
     3:5:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):62:64 -> a
     3:5:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     6:6:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):64 -> a
     6:6:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
     7:9:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):65:67 -> a
     7:9:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
-    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
+    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> a
     10:10:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):68 -> a
     10:10:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):51 -> a
     11:11:boolean com.android.tools.r8.optimize.PublicizerLens.publicizedMethodIsPresentOnHolder(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):68:68 -> a
@@ -66100,15 +66525,15 @@
     com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult) -> b
     boolean isLegitimateToHaveEmptyMappings() -> k
     1:1:com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder createBuilder():73:73 -> l
-com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.pv:
-com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.qv:
+com.android.tools.r8.optimize.PublicizerLens$1 -> com.android.tools.r8.internal.Kv:
+com.android.tools.r8.optimize.PublicizerLens$PublicizedLensBuilder -> com.android.tools.r8.internal.Lv:
     java.util.Set publicizedMethods -> a
     1:1:void <init>(com.android.tools.r8.optimize.PublicizerLens$1):76:76 -> <init>
     2:2:void <init>():79:79 -> <init>
     3:3:void <init>():77:77 -> <init>
     1:4:com.android.tools.r8.graph.GraphLens build(com.android.tools.r8.graph.AppView):82:85 -> a
     5:5:void add(com.android.tools.r8.graph.DexMethod):89:89 -> a
-com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.PC:
+com.android.tools.r8.optimize.VisibilityBridgeRemover -> com.android.tools.r8.internal.FD:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():19:19 -> <clinit>
@@ -66120,17 +66545,17 @@
     29:30:void lambda$removeUnneededVisibilityBridges$1(java.util.Set,com.android.tools.r8.graph.DexEncodedMethod[],com.android.tools.r8.utils.IntBox,com.android.tools.r8.graph.ProgramMethod):57:58 -> a
     31:34:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):67:70 -> a
     31:34:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():472:472 -> a
+    35:35:boolean com.android.tools.r8.graph.DexEncodedMethod.isBridge():476:476 -> a
     35:35:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71 -> a
     35:35:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
     36:46:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):71:81 -> a
     36:46:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    47:47:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):176:176 -> a
+    47:47:boolean com.android.tools.r8.graph.DexMethod.hasSameProtoAndName(com.android.tools.r8.graph.DexMethod):180:180 -> a
     47:47:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):81 -> a
     47:47:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
     48:48:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:82 -> a
     48:48:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
-    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> a
+    49:49:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():488:488 -> a
     49:49:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82 -> a
     49:49:void lambda$removeUnneededVisibilityBridges$0(java.util.Set,com.android.tools.r8.graph.ProgramMethod):48 -> a
     50:58:boolean com.android.tools.r8.optimize.VisibilityBridgeRemover.isUnneededVisibilityBridge(com.android.tools.r8.graph.ProgramMethod):82:90 -> a
@@ -66147,74 +66572,74 @@
     1:4:void <clinit>():66:69 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView):77:79 -> <init>
     1:1:void run():83:83 -> a
-    2:1362:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():0:1360 -> a
-    2:1362:void run():83 -> a
-    1363:1381:void run():84:102 -> a
-    1382:1382:void lambda$run$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):86:86 -> a
-    1383:1385:void lambda$run$1(com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):104:106 -> a
-    1386:1389:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):115:118 -> a
-    1390:1390:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1390:1390:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):118 -> a
-    1391:1395:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):118:122 -> a
-    1396:1402:java.util.Set com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getCandidatesForHoisting(java.util.Set):130:136 -> a
-    1396:1402:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):124 -> a
-    1403:1404:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):124:125 -> a
-    1405:1405:int lambda$processClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):116:116 -> a
-    1406:1455:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):148:197 -> a
-    1456:1458:java.util.Map$Entry com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findMostFrequentBridge(java.util.Map):254:256 -> a
-    1456:1458:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):200 -> a
-    1459:1461:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):201:203 -> a
-    1462:1465:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findRepresentative(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):264:267 -> a
-    1462:1465:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):206 -> a
-    1466:1469:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):275:278 -> a
-    1466:1469:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
-    1470:1470:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
-    1470:1470:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):278 -> a
-    1470:1470:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
-    1471:1483:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):215:227 -> a
-    1484:1486:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):282:284 -> a
-    1484:1486:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1487:1489:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):293:295 -> a
-    1487:1489:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):284 -> a
-    1487:1489:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1490:1490:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
-    1490:1490:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):296 -> a
-    1490:1490:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):284 -> a
-    1490:1490:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1491:1509:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):296:314 -> a
-    1491:1509:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):284 -> a
-    1491:1509:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1510:1511:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):286:287 -> a
-    1510:1511:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1512:1515:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):319:322 -> a
-    1512:1515:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
-    1512:1515:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1516:1516:boolean com.android.tools.r8.code.Instruction.isInvokeVirtual():0:0 -> a
-    1516:1516:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):323 -> a
-    1516:1516:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
-    1516:1516:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1517:1523:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):324:330 -> a
-    1517:1523:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
-    1517:1523:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1524:1524:boolean com.android.tools.r8.code.Instruction.isInvokeVirtualRange():0:0 -> a
-    1524:1524:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):332 -> a
-    1524:1524:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
-    1524:1524:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1525:1544:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):333:352 -> a
-    1525:1544:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
-    1525:1544:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1545:1552:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228:235 -> a
-    1553:1553:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
-    1553:1553:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):236 -> a
-    1554:1554:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):236:236 -> a
-    1555:1555:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
-    1555:1555:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
-    1556:1565:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237:246 -> a
-    1566:1566:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):289:289 -> a
-    1566:1566:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
-    1567:1567:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findRepresentative(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):270:270 -> a
-    1567:1567:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):206 -> a
-    1568:1568:java.util.List lambda$hoistBridgeIfPossible$3(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):192:192 -> a
+    2:1422:com.android.tools.r8.graph.SubtypingInfo com.android.tools.r8.shaking.AppInfoWithLiveness.computeSubtypingInfo():0:1420 -> a
+    2:1422:void run():83 -> a
+    1423:1441:void run():84:102 -> a
+    1442:1442:void lambda$run$0(com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.graph.DexProgramClass):86:86 -> a
+    1443:1445:void lambda$run$1(com.android.tools.r8.graph.MethodAccessInfoCollection$Modifier,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.info.bridge.BridgeInfo):104:106 -> a
+    1446:1449:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):115:118 -> a
+    1450:1450:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1450:1450:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):118 -> a
+    1451:1455:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):118:122 -> a
+    1456:1462:java.util.Set com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.getCandidatesForHoisting(java.util.Set):130:136 -> a
+    1456:1462:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):124 -> a
+    1463:1464:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.SubtypingInfo):124:125 -> a
+    1465:1465:int lambda$processClass$2(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):116:116 -> a
+    1466:1515:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):148:197 -> a
+    1516:1518:java.util.Map$Entry com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findMostFrequentBridge(java.util.Map):254:256 -> a
+    1516:1518:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):200 -> a
+    1519:1521:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):201:203 -> a
+    1522:1525:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findRepresentative(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):264:267 -> a
+    1522:1525:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):206 -> a
+    1526:1529:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):275:278 -> a
+    1526:1529:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
+    1530:1530:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> a
+    1530:1530:boolean com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.mayBecomeInaccessibleAfterHoisting(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):278 -> a
+    1530:1530:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):209 -> a
+    1531:1543:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):215:227 -> a
+    1544:1546:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):282:284 -> a
+    1544:1546:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1547:1549:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):293:295 -> a
+    1547:1549:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):284 -> a
+    1547:1549:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1550:1550:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
+    1550:1550:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):296 -> a
+    1550:1550:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):284 -> a
+    1550:1550:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1551:1569:com.android.tools.r8.graph.CfCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCfCodeForVirtualBridge(com.android.tools.r8.graph.CfCode,com.android.tools.r8.graph.DexMethod):296:314 -> a
+    1551:1569:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):284 -> a
+    1551:1569:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1570:1571:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):286:287 -> a
+    1570:1571:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1572:1575:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):319:322 -> a
+    1572:1575:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
+    1572:1575:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1576:1576:boolean com.android.tools.r8.code.Instruction.isInvokeVirtual():0:0 -> a
+    1576:1576:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):323 -> a
+    1576:1576:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
+    1576:1576:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1577:1583:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):324:330 -> a
+    1577:1583:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
+    1577:1583:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1584:1584:boolean com.android.tools.r8.code.Instruction.isInvokeVirtualRange():0:0 -> a
+    1584:1584:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):332 -> a
+    1584:1584:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
+    1584:1584:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1585:1604:com.android.tools.r8.graph.DexCode com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createDexCodeForVirtualBridge(com.android.tools.r8.graph.DexCode,com.android.tools.r8.graph.DexMethod):333:352 -> a
+    1585:1604:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):287 -> a
+    1585:1604:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1605:1612:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228:235 -> a
+    1613:1613:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
+    1613:1613:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):236 -> a
+    1614:1614:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):236:236 -> a
+    1615:1615:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.DexEncodedMethod.getAccessFlags():201:201 -> a
+    1615:1615:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237 -> a
+    1616:1625:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):237:246 -> a
+    1626:1626:com.android.tools.r8.graph.Code com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.createCodeForVirtualBridge(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):289:289 -> a
+    1626:1626:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):228 -> a
+    1627:1627:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.optimize.bridgehoisting.BridgeHoisting.findRepresentative(java.lang.Iterable,com.android.tools.r8.graph.DexMethod):270:270 -> a
+    1627:1627:void hoistBridgeIfPossible(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexProgramClass,java.util.Set):206 -> a
+    1628:1628:java.util.List lambda$hoistBridgeIfPossible$3(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):192:192 -> a
 com.android.tools.r8.optimize.bridgehoisting.BridgeHoistingLens -> com.android.tools.r8.internal.L2:
     com.android.tools.r8.utils.collections.BidirectionalManyToOneMap bridgeToHoistedBridgeMap -> f
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.BidirectionalManyToOneMap):25:26 -> <init>
@@ -66346,7 +66771,7 @@
     16:26:com.android.tools.r8.org.objectweb.asm.ByteVector put122(int,int,int):195:205 -> b
     1:10:com.android.tools.r8.org.objectweb.asm.ByteVector putInt(int):172:181 -> c
     1:8:com.android.tools.r8.org.objectweb.asm.ByteVector putShort(int):110:117 -> d
-com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.T5:
+com.android.tools.r8.org.objectweb.asm.ClassReader -> com.android.tools.r8.internal.X5:
     int[] bootstrapMethodOffsets -> f
     byte[] classFileBuffer -> b
     byte[] b -> a
@@ -66537,13 +66962,13 @@
     1:2:short readShort(int):3578:3579 -> f
     3:9:java.lang.String readUtf(int,char[]):3640:3646 -> f
     1:2:int readUnsignedShort(int):3566:3567 -> g
-com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.c6:
+com.android.tools.r8.org.objectweb.asm.ClassTooLargeException -> com.android.tools.r8.internal.g6:
     java.lang.String className -> a
     int constantPoolCount -> b
     1:3:void <init>(java.lang.String,int):49:51 -> <init>
     1:1:java.lang.String getClassName():60:60 -> a
     1:1:int getConstantPoolCount():69:69 -> b
-com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.e6:
+com.android.tools.r8.org.objectweb.asm.ClassVisitor -> com.android.tools.r8.internal.i6:
     com.android.tools.r8.org.objectweb.asm.ClassVisitor cv -> b
     int api -> a
     1:1:void <init>(int):57:57 -> <init>
@@ -66569,7 +66994,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor visitRecordComponent(java.lang.String,java.lang.String,java.lang.String):302:302 -> b
     1:5:void visitPermittedSubtypeExperimental(java.lang.String):262:266 -> c
     6:6:void visitPermittedSubtypeExperimental(java.lang.String):263:263 -> c
-com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.f6:
+com.android.tools.r8.org.objectweb.asm.ClassWriter -> com.android.tools.r8.internal.j6:
     int numberOfInnerClasses -> n
     com.android.tools.r8.org.objectweb.asm.FieldWriter firstField -> j
     int interfaceCount -> h
@@ -66630,7 +67055,7 @@
     295:295:byte[] toByteArray():727:727 -> b
     296:296:byte[] toByteArray():606:606 -> b
     1:5:void visitPermittedSubtypeExperimental(java.lang.String):384:388 -> c
-com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.g7:
+com.android.tools.r8.org.objectweb.asm.ConstantDynamic -> com.android.tools.r8.internal.l7:
     java.lang.Object[] bootstrapMethodArguments -> d
     java.lang.String name -> a
     java.lang.String descriptor -> b
@@ -66643,7 +67068,7 @@
     1:8:boolean equals(java.lang.Object):150:157 -> equals
     1:4:int hashCode():162:165 -> hashCode
     1:7:java.lang.String toString():170:176 -> toString
-com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.p7:
+com.android.tools.r8.org.objectweb.asm.Context -> com.android.tools.r8.internal.u7:
     int currentFrameType -> n
     java.lang.String currentMethodDescriptor -> f
     int currentFrameLocalCount -> o
@@ -66664,15 +67089,15 @@
     int[] currentLocalVariableAnnotationRangeIndices -> l
     int currentFrameLocalCountDelta -> p
     1:1:void <init>():36:36 -> <init>
-com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.s7:
+com.android.tools.r8.org.objectweb.asm.CurrentFrame -> com.android.tools.r8.internal.x7:
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.Label):40:40 -> <init>
     1:4:void execute(int,int,com.android.tools.r8.org.objectweb.asm.Symbol,com.android.tools.r8.org.objectweb.asm.SymbolTable):51:54 -> a
-com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.d9:
+com.android.tools.r8.org.objectweb.asm.Edge -> com.android.tools.r8.internal.m9:
     com.android.tools.r8.org.objectweb.asm.Label successor -> b
     int info -> a
     com.android.tools.r8.org.objectweb.asm.Edge nextEdge -> c
     1:4:void <init>(int,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Edge):86:89 -> <init>
-com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.La:
+com.android.tools.r8.org.objectweb.asm.FieldVisitor -> com.android.tools.r8.internal.Ua:
     com.android.tools.r8.org.objectweb.asm.FieldVisitor fv -> a
     1:1:void <init>(int):57:57 -> <init>
     2:15:void <init>(int,com.android.tools.r8.org.objectweb.asm.FieldVisitor):69:82 -> <init>
@@ -66680,7 +67105,7 @@
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
     1:2:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean):94:95 -> a
     3:4:void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute):130:131 -> a
-com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Ma:
+com.android.tools.r8.org.objectweb.asm.FieldWriter -> com.android.tools.r8.internal.Va:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.Attribute firstAttribute -> l
@@ -66702,7 +67127,7 @@
     67:67:void putFieldInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):272 -> a
     68:68:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):282:282 -> a
     1:14:int computeFieldInfoSize():195:208 -> b
-com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.lb:
+com.android.tools.r8.org.objectweb.asm.Frame -> com.android.tools.r8.internal.ub:
     short outputStackTop -> g
     short outputStackStart -> f
     int[] initializations -> i
@@ -66799,7 +67224,7 @@
     12:16:int pop():567:571 -> b
     17:23:void pop(int):581:587 -> b
     1:16:void push(int):524:539 -> c
-com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Mb:
+com.android.tools.r8.org.objectweb.asm.Handle -> com.android.tools.r8.internal.Vb:
     boolean isInterface -> e
     java.lang.String name -> c
     java.lang.String owner -> b
@@ -66814,7 +67239,7 @@
     1:9:boolean equals(java.lang.Object):159:167 -> equals
     1:3:int hashCode():172:174 -> hashCode
     1:1:java.lang.String toString():187:187 -> toString
-com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.Nb:
+com.android.tools.r8.org.objectweb.asm.Handler -> com.android.tools.r8.internal.Wb:
     com.android.tools.r8.org.objectweb.asm.Handler nextHandler -> f
     com.android.tools.r8.org.objectweb.asm.Label handlerPc -> c
     int catchType -> d
@@ -66830,7 +67255,7 @@
     25:26:void com.android.tools.r8.org.objectweb.asm.Handler.<init>(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):106:107 -> a
     25:26:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147 -> a
     27:28:com.android.tools.r8.org.objectweb.asm.Handler removeRange(com.android.tools.r8.org.objectweb.asm.Handler,com.android.tools.r8.org.objectweb.asm.Label,com.android.tools.r8.org.objectweb.asm.Label):147:148 -> a
-com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.ll:
+com.android.tools.r8.org.objectweb.asm.Label -> com.android.tools.r8.internal.yl:
     int bytecodeOffset -> f
     com.android.tools.r8.org.objectweb.asm.Edge outgoingEdges -> n
     com.android.tools.r8.org.objectweb.asm.Frame frame -> l
@@ -66858,7 +67283,7 @@
     92:126:void addSubroutineRetSuccessors(com.android.tools.r8.org.objectweb.asm.Label):542:576 -> a
     1:13:com.android.tools.r8.org.objectweb.asm.Label pushSuccessors(com.android.tools.r8.org.objectweb.asm.Label):592:604 -> b
     1:1:java.lang.String toString():620:620 -> toString
-com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.Lo:
+com.android.tools.r8.org.objectweb.asm.MethodTooLargeException -> com.android.tools.r8.internal.Xo:
     java.lang.String className -> a
     int codeSize -> d
     java.lang.String descriptor -> c
@@ -66868,7 +67293,7 @@
     1:1:int getCodeSize():97:97 -> b
     1:1:java.lang.String getDescriptor():88:88 -> c
     1:1:java.lang.String getMethodName():79:79 -> d
-com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.Mo:
+com.android.tools.r8.org.objectweb.asm.MethodVisitor -> com.android.tools.r8.internal.Yo:
     int api -> h
     com.android.tools.r8.org.objectweb.asm.MethodVisitor mv -> i
     1:1:void <init>(int):71:71 -> <init>
@@ -66913,7 +67338,7 @@
     7:8:void visitMaxs(int,int):771:772 -> c
     9:10:void visitEnd():781:782 -> c
     1:2:void visitVarInsn(int,int):357:358 -> d
-com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.No:
+com.android.tools.r8.org.objectweb.asm.MethodWriter -> com.android.tools.r8.internal.Zo:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> I
     int accessFlags -> l
     boolean hasAsmInstructions -> f0
@@ -67102,7 +67527,7 @@
     107:107:void com.android.tools.r8.org.objectweb.asm.MethodWriter.putFrame():1914:1914 -> h
     107:107:void visitFrameEnd():1850 -> h
     108:111:void visitFrameEnd():1851:1854 -> h
-com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.Oo:
+com.android.tools.r8.org.objectweb.asm.ModuleVisitor -> com.android.tools.r8.internal.ap:
     1:1:void <init>(int):57:57 -> <init>
     2:12:void <init>(int,com.android.tools.r8.org.objectweb.asm.ModuleVisitor):68:78 -> <init>
     void visitExport(java.lang.String,int,java.lang.String[]) -> a
@@ -67112,7 +67537,7 @@
     void visitOpen(java.lang.String,int,java.lang.String[]) -> b
     void visitPackage(java.lang.String) -> b
     void visitUse(java.lang.String) -> c
-com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.Po:
+com.android.tools.r8.org.objectweb.asm.ModuleWriter -> com.android.tools.r8.internal.bp:
     com.android.tools.r8.org.objectweb.asm.ByteVector provides -> n
     int packageCount -> o
     com.android.tools.r8.org.objectweb.asm.ByteVector usesIndex -> l
@@ -67141,7 +67566,7 @@
     3:12:void visitOpen(java.lang.String,int,java.lang.String[]):146:155 -> b
     13:13:int getAttributeCount():186:186 -> b
     1:2:void visitUse(java.lang.String):160:161 -> c
-com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.Jr:
+com.android.tools.r8.org.objectweb.asm.Opcodes -> com.android.tools.r8.internal.Vr:
     java.lang.Integer FLOAT -> c
     java.lang.Integer DOUBLE -> d
     java.lang.Integer LONG -> e
@@ -67150,14 +67575,14 @@
     java.lang.Integer TOP -> a
     java.lang.Integer INTEGER -> b
     1:7:void <clinit>():387:393 -> <clinit>
-com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Bv:
+com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor -> com.android.tools.r8.internal.Wv:
     com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor delegate -> a
     1:1:void <init>(int):56:56 -> <init>
     2:15:void <init>(int,com.android.tools.r8.org.objectweb.asm.RecordComponentVisitor):67:80 -> <init>
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitAnnotation(java.lang.String,boolean) -> a
     void visitAttribute(com.android.tools.r8.org.objectweb.asm.Attribute) -> a
     com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean) -> a
-com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.Cv:
+com.android.tools.r8.org.objectweb.asm.RecordComponentWriter -> com.android.tools.r8.internal.Xv:
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleTypeAnnotation -> h
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeInvisibleTypeAnnotation -> i
     com.android.tools.r8.org.objectweb.asm.AnnotationWriter lastRuntimeVisibleAnnotation -> f
@@ -67176,7 +67601,7 @@
     56:56:void com.android.tools.r8.org.objectweb.asm.Attribute.putAttributes(com.android.tools.r8.org.objectweb.asm.SymbolTable,com.android.tools.r8.org.objectweb.asm.ByteVector):279:279 -> a
     56:56:void putRecordComponentInfo(com.android.tools.r8.org.objectweb.asm.ByteVector):213 -> a
     57:57:void collectAttributePrototypes(com.android.tools.r8.org.objectweb.asm.Attribute$Set):223:223 -> a
-com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.Qz:
+com.android.tools.r8.org.objectweb.asm.SymbolTable -> com.android.tools.r8.internal.jA:
     com.android.tools.r8.org.objectweb.asm.ClassWriter classWriter -> a
     int typeCount -> k
     int bootstrapMethodCount -> i
@@ -67318,7 +67743,7 @@
     2:2:int addType(java.lang.String):1140 -> e
     3:10:int addType(java.lang.String):1141:1148 -> e
     1:1:com.android.tools.r8.org.objectweb.asm.ClassReader getSource():288:288 -> f
-com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.Pz:
+com.android.tools.r8.org.objectweb.asm.SymbolTable$Entry -> com.android.tools.r8.internal.iA:
     long com.android.tools.r8.org.objectweb.asm.Symbol.data -> f
     int hashCode -> h
     int com.android.tools.r8.org.objectweb.asm.Symbol.info -> g
@@ -67345,7 +67770,7 @@
     40:40:void <init>(int,int,java.lang.String,java.lang.String,java.lang.String,long,int):1298:1298 -> <init>
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():238:241 -> a
     1:4:int com.android.tools.r8.org.objectweb.asm.Symbol.getArgumentsAndReturnSizes():0 -> a
-com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.WA:
+com.android.tools.r8.org.objectweb.asm.Type -> com.android.tools.r8.internal.qB:
     int valueBegin -> l
     int valueEnd -> m
     int sort -> j
@@ -67382,7 +67807,7 @@
     1:1:com.android.tools.r8.org.objectweb.asm.Type getType(java.lang.String):177:177 -> g
     1:4:int hashCode():877:880 -> hashCode
     1:1:java.lang.String toString():893:893 -> toString
-com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.GB:
+com.android.tools.r8.org.objectweb.asm.TypePath -> com.android.tools.r8.internal.aC:
     byte[] typePathContainer -> a
     int typePathOffset -> b
     1:3:void <init>(byte[],int):72:74 -> <init>
@@ -67399,7 +67824,7 @@
     7:7:java.lang.String toString():174:174 -> toString
     8:8:java.lang.String toString():171:171 -> toString
     9:24:java.lang.String toString():168:183 -> toString
-com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.HB:
+com.android.tools.r8.org.objectweb.asm.TypeReference -> com.android.tools.r8.internal.bC:
     1:2:void com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):186:187 -> a
     3:10:boolean com.android.tools.r8.org.objectweb.asm.Constants.isWhitelisted(java.lang.String):194:201 -> a
     3:10:void com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):188 -> a
@@ -67410,7 +67835,7 @@
     23:24:void com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):189 -> a
     25:25:void com.android.tools.r8.org.objectweb.asm.Constants.checkIsPreview(java.io.InputStream):207:207 -> a
     25:25:void com.android.tools.r8.org.objectweb.asm.Constants.checkAsmExperimental(java.lang.Object):189 -> a
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.Ug:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter -> com.android.tools.r8.internal.hh:
     java.util.BitSet sharedSubroutineInsns -> F
     java.util.Map subroutinesInsns -> E
     java.util.BitSet mainSubroutineInsns -> D
@@ -67449,7 +67874,7 @@
     103:105:void com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter.emitCode():315:317 -> c
     103:105:void visitEnd():155 -> c
     106:107:void visitEnd():157:158 -> c
-com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.Tg:
+com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation -> com.android.tools.r8.internal.gh:
     java.util.Map clonedLabels -> c
     com.android.tools.r8.org.objectweb.asm.commons.JSRInlinerAdapter$Instantiation parent -> a
     java.util.BitSet subroutineInsns -> b
@@ -67517,7 +67942,7 @@
     82:90:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitArray(java.lang.String):151:159 -> a
     91:98:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor):190:197 -> a
     99:115:void accept(com.android.tools.r8.org.objectweb.asm.AnnotationVisitor,java.lang.String,java.lang.Object):211:227 -> a
-com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.ua:
+com.android.tools.r8.org.objectweb.asm.tree.FieldInsnNode -> com.android.tools.r8.internal.Da:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -67525,7 +67950,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):88:89 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):94:94 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.mb:
+com.android.tools.r8.org.objectweb.asm.tree.FrameNode -> com.android.tools.r8.internal.vb:
     int type -> g
     java.util.List stack -> i
     java.util.List local -> h
@@ -67544,14 +67969,14 @@
     25:44:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):152:171 -> a
     45:51:java.lang.Object[] asArray(java.util.List):178:184 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.yc:
+com.android.tools.r8.org.objectweb.asm.tree.IincInsnNode -> com.android.tools.r8.internal.Kc:
     int incr -> h
     int var -> g
     1:3:void <init>(int,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.Md:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList -> com.android.tools.r8.internal.ae:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode[] cache -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode firstInsn -> b
     int size -> a
@@ -67573,7 +67998,7 @@
     1:1:java.util.ListIterator com.android.tools.r8.org.objectweb.asm.tree.InsnList.iterator():156 -> iterator
     1:1:java.util.Iterator iterator():38 -> iterator
     1:1:int size():61:61 -> size
-com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.Md$a:
+com.android.tools.r8.org.objectweb.asm.tree.InsnList$InsnListIterator -> com.android.tools.r8.internal.ae$a:
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode nextInsn -> a
     com.android.tools.r8.org.objectweb.asm.tree.InsnList this$0 -> d
     com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode previousInsn -> b
@@ -67590,18 +68015,18 @@
     1:7:int previousIndex():561:567 -> previousIndex
     1:10:void remove():518:527 -> remove
     1:9:void set(java.lang.Object):585:593 -> set
-com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.Nd:
+com.android.tools.r8.org.objectweb.asm.tree.InsnNode -> com.android.tools.r8.internal.be:
     1:1:void <init>(int):55:55 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):65:66 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):71:71 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.sf:
+com.android.tools.r8.org.objectweb.asm.tree.IntInsnNode -> com.android.tools.r8.internal.Ff:
     int operand -> g
     1:2:void <init>(int,int):51:52 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):71:72 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):77:77 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.rg:
+com.android.tools.r8.org.objectweb.asm.tree.InvokeDynamicInsnNode -> com.android.tools.r8.internal.Eg:
     java.lang.String name -> g
     java.lang.String desc -> h
     com.android.tools.r8.org.objectweb.asm.Handle bsm -> i
@@ -67610,7 +68035,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):84:85 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:90 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.kh:
+com.android.tools.r8.org.objectweb.asm.tree.JumpInsnNode -> com.android.tools.r8.internal.xh:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode label -> g
     1:2:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):57:58 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):79:80 -> a
@@ -67619,7 +68044,7 @@
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85 -> a
     5:5:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):85:85 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.ml:
+com.android.tools.r8.org.objectweb.asm.tree.LabelNode -> com.android.tools.r8.internal.zl:
     com.android.tools.r8.org.objectweb.asm.Label value -> g
     1:1:void <init>():40:40 -> <init>
     1:1:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):68:68 -> a
@@ -67627,13 +68052,13 @@
     int getType() -> b
     1:4:com.android.tools.r8.org.objectweb.asm.Label getLabel():60:63 -> c
     1:1:void resetLabel():77:77 -> d
-com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.am:
+com.android.tools.r8.org.objectweb.asm.tree.LdcInsnNode -> com.android.tools.r8.internal.nm:
     java.lang.Object cst -> g
     1:2:void <init>(java.lang.Object):55:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.om:
+com.android.tools.r8.org.objectweb.asm.tree.LineNumberNode -> com.android.tools.r8.internal.Bm:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> h
     int line -> g
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.tree.LabelNode):55:57 -> <init>
@@ -67643,14 +68068,14 @@
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72 -> a
     4:4:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.Tm:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableAnnotationNode -> com.android.tools.r8.internal.gn:
     java.util.List end -> f
     java.util.List start -> e
     java.util.List index -> g
     1:4:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],com.android.tools.r8.org.objectweb.asm.tree.LabelNode[],int[],java.lang.String):116:119 -> <init>
     1:10:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):129:138 -> a
     11:11:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor,boolean):137:137 -> a
-com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.Um:
+com.android.tools.r8.org.objectweb.asm.tree.LocalVariableNode -> com.android.tools.r8.internal.hn:
     int index -> f
     java.lang.String name -> a
     java.lang.String signature -> c
@@ -67658,7 +68083,7 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> d
     1:7:void <init>(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,int):74:80 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.pn:
+com.android.tools.r8.org.objectweb.asm.tree.LookupSwitchInsnNode -> com.android.tools.r8.internal.Bn:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> g
     java.util.List labels -> i
     java.util.List keys -> h
@@ -67669,7 +68094,7 @@
     12:12:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89 -> a
     13:15:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):89:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.yo:
+com.android.tools.r8.org.objectweb.asm.tree.MethodInsnNode -> com.android.tools.r8.internal.Ko:
     java.lang.String owner -> g
     java.lang.String desc -> i
     java.lang.String name -> h
@@ -67678,7 +68103,7 @@
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):115:116 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):121:121 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.Do:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode -> com.android.tools.r8.internal.Po:
     java.util.List attrs -> p
     java.util.List invisibleTypeAnnotations -> o
     java.lang.String desc -> j
@@ -67762,22 +68187,22 @@
     1:5:com.android.tools.r8.org.objectweb.asm.AnnotationVisitor visitTypeAnnotation(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String,boolean):274:278 -> c
     6:7:void visitMaxs(int,int):517:518 -> c
     1:1:void visitVarInsn(int,int):353:353 -> d
-com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.Co:
+com.android.tools.r8.org.objectweb.asm.tree.MethodNode$1 -> com.android.tools.r8.internal.Oo:
     com.android.tools.r8.org.objectweb.asm.tree.MethodNode this$0 -> a
     1:1:void <init>(com.android.tools.r8.org.objectweb.asm.tree.MethodNode,int):251:251 -> <init>
     1:2:boolean add(java.lang.Object):254:255 -> add
-com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.Wo:
+com.android.tools.r8.org.objectweb.asm.tree.MultiANewArrayInsnNode -> com.android.tools.r8.internal.ip:
     java.lang.String desc -> g
     int dims -> h
     1:3:void <init>(java.lang.String,int):54:56 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):66:67 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):72:72 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.ns:
+com.android.tools.r8.org.objectweb.asm.tree.ParameterNode -> com.android.tools.r8.internal.zs:
     java.lang.String name -> a
     int access -> b
     1:3:void <init>(java.lang.String,int):55:57 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.lA:
+com.android.tools.r8.org.objectweb.asm.tree.TableSwitchInsnNode -> com.android.tools.r8.internal.DA:
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode dflt -> i
     int max -> h
     java.util.List labels -> j
@@ -67789,7 +68214,7 @@
     8:8:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90 -> a
     9:10:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):90:91 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.UA:
+com.android.tools.r8.org.objectweb.asm.tree.TryCatchBlockNode -> com.android.tools.r8.internal.oB:
     java.util.List invisibleTypeAnnotations -> f
     java.util.List visibleTypeAnnotations -> e
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode start -> a
@@ -67797,30 +68222,30 @@
     com.android.tools.r8.org.objectweb.asm.tree.LabelNode end -> b
     java.lang.String type -> d
     1:5:void <init>(com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,com.android.tools.r8.org.objectweb.asm.tree.LabelNode,java.lang.String):73:77 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.AB:
+com.android.tools.r8.org.objectweb.asm.tree.TypeAnnotationNode -> com.android.tools.r8.internal.UB:
     int typeRef -> c
     com.android.tools.r8.org.objectweb.asm.TypePath typePath -> d
     1:3:void <init>(int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):62:64 -> <init>
     4:6:void <init>(int,int,com.android.tools.r8.org.objectweb.asm.TypePath,java.lang.String):82:84 -> <init>
-com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.FB:
+com.android.tools.r8.org.objectweb.asm.tree.TypeInsnNode -> com.android.tools.r8.internal.ZB:
     java.lang.String desc -> g
     1:2:void <init>(int,java.lang.String):56:57 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):77:78 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):83:83 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.pC:
+com.android.tools.r8.org.objectweb.asm.tree.Util -> com.android.tools.r8.internal.OC:
     1:2:java.util.List add(java.util.List,java.lang.Object):44:45 -> a
     3:5:java.util.List asArrayList(int):50:52 -> a
     6:10:java.util.List asArrayList(java.lang.Object[]):59:63 -> a
     11:15:java.util.List asArrayList(int[]):114:118 -> a
     16:18:java.util.List asArrayList(int,java.lang.Object[]):157:159 -> a
-com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.yC:
+com.android.tools.r8.org.objectweb.asm.tree.VarInsnNode -> com.android.tools.r8.internal.aD:
     int var -> g
     1:2:void <init>(int,int):53:54 -> <init>
     1:2:void accept(com.android.tools.r8.org.objectweb.asm.MethodVisitor):74:75 -> a
     3:3:com.android.tools.r8.org.objectweb.asm.tree.AbstractInsnNode clone(java.util.Map):80:80 -> a
     int getType() -> b
-com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.at:
+com.android.tools.r8.org.objectweb.asm.util.Printer -> com.android.tools.r8.internal.vt:
     java.lang.String[] OPCODES -> a
     1:1:void <clinit>():54:54 -> <clinit>
 com.android.tools.r8.origin.ArchiveEntryOrigin -> com.android.tools.r8.origin.ArchiveEntryOrigin:
@@ -67871,7 +68296,7 @@
     1:3:void <init>(java.nio.file.Path):19:21 -> <init>
     1:1:java.nio.file.Path getPath():30:30 -> getPath
     1:1:java.lang.String part():26:26 -> part
-com.android.tools.r8.origin.SynthesizedOrigin -> com.android.tools.r8.internal.Tz:
+com.android.tools.r8.origin.SynthesizedOrigin -> com.android.tools.r8.internal.mA:
     java.lang.String reason -> e
     1:2:void <init>(java.lang.String,java.lang.Class):13:14 -> <init>
     1:1:java.lang.String part():20:20 -> part
@@ -68179,7 +68604,7 @@
     6:9:java.util.Map getRenamedItems(java.lang.Class,java.util.function.Predicate,java.util.function.Function):141:144 -> a
     10:10:boolean lambda$getRenamedItems$0(java.lang.Class,java.util.function.Predicate,com.android.tools.r8.graph.DexType):142:142 -> a
     boolean verifyRenamingConsistentWithResolution(com.android.tools.r8.graph.DexMethod) -> b
-com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.Rw:
+com.android.tools.r8.repackaging.Repackaging -> com.android.tools.r8.internal.kx:
     com.android.tools.r8.graph.AppView appView -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration repackagingConfiguration -> d
@@ -68188,48 +68613,48 @@
     1:5:void <init>(com.android.tools.r8.graph.AppView):50:54 -> <init>
     1:3:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):60:62 -> a
     4:4:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):69:69 -> a
-    5:1140:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():0:1135 -> a
-    5:1140:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):69 -> a
-    1141:1144:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):73:76 -> a
-    1145:1160:void com.android.tools.r8.repackaging.Repackaging.processPackagesInDesiredLocation(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set):92:107 -> a
-    1145:1160:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):77 -> a
-    1161:1165:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):120:124 -> a
-    1161:1165:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
-    1166:1172:java.lang.Iterable com.android.tools.r8.repackaging.Repackaging.computeClassesToRepackage(com.android.tools.r8.graph.ProgramPackage,java.util.concurrent.ExecutorService):169:175 -> a
-    1166:1172:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):127 -> a
-    1166:1172:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
-    1173:1177:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):128:132 -> a
-    1173:1177:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
-    1178:1182:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):79:83 -> a
-    1183:1183:boolean lambda$run$0(java.util.Map$Entry):79:79 -> a
-    1184:1192:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):144:152 -> a
-    1193:1193:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1193:1193:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):152 -> a
-    1194:1205:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):152:163 -> a
-    1206:1206:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):161:161 -> a
-com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.Rw$a:
+    5:1146:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():0:1141 -> a
+    5:1146:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):69 -> a
+    1147:1150:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):73:76 -> a
+    1151:1166:void com.android.tools.r8.repackaging.Repackaging.processPackagesInDesiredLocation(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set):92:107 -> a
+    1151:1166:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):77 -> a
+    1167:1171:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):120:124 -> a
+    1167:1171:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
+    1172:1178:java.lang.Iterable com.android.tools.r8.repackaging.Repackaging.computeClassesToRepackage(com.android.tools.r8.graph.ProgramPackage,java.util.concurrent.ExecutorService):169:175 -> a
+    1172:1178:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):127 -> a
+    1172:1178:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
+    1179:1183:void com.android.tools.r8.repackaging.Repackaging.processRemainingPackages(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Set,java.util.concurrent.ExecutorService):128:132 -> a
+    1179:1183:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):78 -> a
+    1184:1188:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):79:83 -> a
+    1189:1189:boolean lambda$run$0(java.util.Map$Entry):79:79 -> a
+    1190:1198:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):144:152 -> a
+    1199:1199:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1199:1199:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):152 -> a
+    1200:1211:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):152:163 -> a
+    1212:1212:void processClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramPackage,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):161:161 -> a
+com.android.tools.r8.repackaging.Repackaging$DefaultRepackagingConfiguration -> com.android.tools.r8.internal.kx$a:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> c
     1:1:void <clinit>():189:189 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.ProguardConfiguration):195:197 -> <init>
     1:3:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):202:204 -> a
-    4:1147:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():0:1143 -> a
-    4:1147:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):204 -> a
-    1148:1154:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):207:213 -> a
-    1155:1179:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):225:249 -> a
-    1180:1180:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):248:248 -> a
-com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.Rw$b:
+    4:1153:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():0:1149 -> a
+    4:1153:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):204 -> a
+    1154:1160:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):207:213 -> a
+    1161:1185:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):225:249 -> a
+    1186:1186:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):248:248 -> a
+com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration -> com.android.tools.r8.internal.kx$b:
     java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set) -> a
     com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap) -> a
-com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.Rw$c:
+com.android.tools.r8.repackaging.Repackaging$SuffixRenamingRepackagingConfiguration -> com.android.tools.r8.internal.kx$c:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String classNameSuffix -> a
     1:3:void <init>(java.lang.String,com.android.tools.r8.graph.DexItemFactory):262:264 -> <init>
     1:1:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):270:270 -> a
     2:21:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):279:298 -> a
     22:22:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):297:297 -> a
-com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.Sw:
+com.android.tools.r8.repackaging.RepackagingAnnotationTracer -> com.android.tools.r8.internal.lx:
     com.android.tools.r8.repackaging.RepackagingUseRegistry registry -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():18:18 -> <clinit>
@@ -68256,7 +68681,7 @@
     114:121:void traceDexValue(com.android.tools.r8.graph.DexValue):90:97 -> a
     122:123:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):40:41 -> a
     122:123:void traceDexValue(com.android.tools.r8.graph.DexValue):97 -> a
-com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.Uw:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph -> com.android.tools.r8.internal.nx:
     com.android.tools.r8.graph.ProgramPackage pkg -> c
     java.util.Map nodes -> d
     com.android.tools.r8.graph.AppView appView -> b
@@ -68271,7 +68696,7 @@
     8:8:void populateConstraints(java.util.concurrent.ExecutorService):88 -> a
     9:9:void populateConstraints(java.util.concurrent.ExecutorService):89:89 -> a
     10:10:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
-    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():610:610 -> a
     11:11:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):96 -> a
     12:34:void registerReferencesFromClass(com.android.tools.r8.graph.DexProgramClass):96:118 -> a
     35:38:void registerReferencesFromField(com.android.tools.r8.graph.ProgramField):123:126 -> a
@@ -68282,14 +68707,14 @@
     49:50:void com.android.tools.r8.graph.DexProto.forEachType(java.util.function.Consumer):40:41 -> a
     49:50:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):137 -> a
     51:52:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):140:141 -> a
-    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():592:592 -> a
+    53:53:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClass.getSuperType():610:610 -> a
     53:53:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):141 -> a
     54:54:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):141:141 -> a
     55:55:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.graph.DexDefinitionSupplier.programDefinitionFor(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):48:48 -> a
     55:55:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):141 -> a
     56:58:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):143:143 -> a
     63:65:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):148:150 -> a
-    66:66:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():848:848 -> a
+    66:66:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():861:861 -> a
     66:66:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):151 -> a
     67:71:void registerReferencesFromMethod(com.android.tools.r8.graph.ProgramMethod):151:155 -> a
     72:80:java.lang.Iterable computeClassesToRepackage():160:168 -> a
@@ -68300,115 +68725,116 @@
     8:9:com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node com.android.tools.r8.repackaging.RepackagingConstraintGraph.createNode(com.android.tools.r8.graph.DexDefinition):72:73 -> b
     8:9:boolean initializeGraph():63 -> b
     10:10:boolean initializeGraph():64:64 -> b
-com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.Tw:
+com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node -> com.android.tools.r8.internal.mx:
     java.util.Set neighbors -> a
     1:3:void <init>():174:176 -> <init>
     1:2:void addNeighbor(com.android.tools.r8.repackaging.RepackagingConstraintGraph$Node):179:180 -> a
     3:3:java.util.Set getNeighbors():184:184 -> a
-com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.Xw:
+com.android.tools.r8.repackaging.RepackagingLens -> com.android.tools.r8.internal.qx:
     com.android.tools.r8.com.google.common.collect.BiMap originalTypes -> m
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.repackaging.RepackagingLens$1):16:16 -> <init>
     2:8:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):26:32 -> <init>
     9:17:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap,com.android.tools.r8.com.google.common.collect.BiMap):25:33 -> <init>
     1:2:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):38:39 -> a
     3:3:boolean isSimpleRenaming(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):44:44 -> a
-com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.Vw:
-com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.Ww:
+com.android.tools.r8.repackaging.RepackagingLens$1 -> com.android.tools.r8.internal.ox:
+com.android.tools.r8.repackaging.RepackagingLens$Builder -> com.android.tools.r8.internal.px:
     com.android.tools.r8.com.google.common.collect.BiMap originalTypes -> b
     com.android.tools.r8.com.google.common.collect.BiMap originalFieldSignatures -> c
     com.android.tools.r8.com.google.common.collect.BiMap originalMethodSignatures -> d
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
     1:5:void <init>():47:51 -> <init>
-com.android.tools.r8.repackaging.RepackagingTreeFixer -> com.android.tools.r8.internal.Yw:
+com.android.tools.r8.repackaging.RepackagingTreeFixer -> com.android.tools.r8.internal.rx:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> d
     com.android.tools.r8.graph.AppView appView -> c
+    java.util.Map protoFixupCache -> i
     com.android.tools.r8.repackaging.RepackagingLens$Builder lensBuilder -> e
     boolean $assertionsDisabled -> a
     com.android.tools.r8.graph.DirectMappedDexApplication$Builder appBuilder -> b
     java.util.Map repackagedClasses -> f
     java.util.Map newProgramClasses -> g
-    java.util.Map protoFixupCache -> h
+    java.util.Map synthesizedFromClasses -> h
     1:1:void <clinit>():30:30 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.graph.AppView,java.util.Map):44:44 -> <init>
-    2:15:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.graph.AppView,java.util.Map):35:48 -> <init>
-    1:5:com.android.tools.r8.repackaging.RepackagingLens run():53:57 -> a
+    1:1:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.graph.AppView,java.util.Map):45:45 -> <init>
+    2:16:void <init>(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,com.android.tools.r8.graph.AppView,java.util.Map):35:49 -> <init>
+    1:5:com.android.tools.r8.repackaging.RepackagingLens run():54:58 -> a
     6:73:com.android.tools.r8.repackaging.RepackagingLens com.android.tools.r8.repackaging.RepackagingLens$Builder.build(com.android.tools.r8.graph.AppView):0:67 -> a
-    6:73:com.android.tools.r8.repackaging.RepackagingLens run():57 -> a
-    74:74:com.android.tools.r8.repackaging.RepackagingLens run():58:58 -> a
-    75:78:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):63:66 -> a
-    79:79:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
-    79:79:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):67 -> a
-    80:80:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():123:123 -> a
-    80:80:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):68 -> a
-    81:82:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):68:69 -> a
-    83:84:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupTypeList(com.android.tools.r8.graph.DexTypeList):284:285 -> a
-    83:84:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):70 -> a
-    85:85:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClass.getSourceFile():131:131 -> a
-    85:85:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):71 -> a
-    86:86:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):72:72 -> a
-    87:87:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):202:202 -> a
-    87:87:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):72 -> a
-    88:88:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):73:73 -> a
-    89:98:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupNestMemberAttributes(java.util.List):208:217 -> a
-    89:98:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):73 -> a
-    99:99:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):74:74 -> a
-    100:112:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):106:118 -> a
-    100:112:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):74 -> a
-    113:113:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75:75 -> a
-    114:120:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):151:157 -> a
-    114:120:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75 -> a
-    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupTypeOrNull(com.android.tools.r8.graph.DexType):253:253 -> a
-    121:121:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):158 -> a
-    121:121:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75 -> a
-    122:122:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):159:159 -> a
-    122:122:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75 -> a
-    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupTypeOrNull(com.android.tools.r8.graph.DexType):253:253 -> a
-    123:123:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):160 -> a
-    123:123:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75 -> a
-    124:130:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):161:161 -> a
-    124:130:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75 -> a
-    131:145:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76:90 -> a
-    146:146:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):88:88 -> a
-    147:154:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):87:94 -> a
-    155:155:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):92:92 -> a
-    156:161:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):91:96 -> a
+    6:73:com.android.tools.r8.repackaging.RepackagingLens run():58 -> a
+    74:74:com.android.tools.r8.repackaging.RepackagingLens run():59:59 -> a
+    75:78:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):64:67 -> a
+    79:79:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
+    79:79:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):68 -> a
+    80:80:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():125:125 -> a
+    80:80:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):69 -> a
+    81:82:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):69:70 -> a
+    83:84:com.android.tools.r8.graph.DexTypeList com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupTypeList(com.android.tools.r8.graph.DexTypeList):289:290 -> a
+    83:84:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):71 -> a
+    85:85:com.android.tools.r8.graph.DexString com.android.tools.r8.graph.DexClass.getSourceFile():133:133 -> a
+    85:85:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):72 -> a
+    86:86:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):73:73 -> a
+    87:87:com.android.tools.r8.graph.NestHostClassAttribute com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupNestHost(com.android.tools.r8.graph.NestHostClassAttribute):203:203 -> a
+    87:87:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):73 -> a
+    88:88:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):74:74 -> a
+    89:98:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupNestMemberAttributes(java.util.List):209:218 -> a
+    89:98:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):74 -> a
+    99:99:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75:75 -> a
+    100:112:com.android.tools.r8.graph.EnclosingMethodAttribute com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupEnclosingMethodAttribute(com.android.tools.r8.graph.EnclosingMethodAttribute):107:119 -> a
+    100:112:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):75 -> a
+    113:113:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76:76 -> a
+    114:120:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):152:158 -> a
+    114:120:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    121:121:com.android.tools.r8.graph.DexType com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupTypeOrNull(com.android.tools.r8.graph.DexType):258:258 -> a
+    121:121:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):159 -> a
+    121:121:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    122:122:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):160:160 -> a
+    122:122:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    123:123:com.android.tools.r8.graph.DexType com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupTypeOrNull(com.android.tools.r8.graph.DexType):258:258 -> a
+    123:123:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):161 -> a
+    123:123:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    124:130:java.util.List com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupInnerClassAttributes(java.util.List):162:162 -> a
+    124:130:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):76 -> a
+    131:145:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):77:91 -> a
+    146:146:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):89:89 -> a
+    147:154:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):88:95 -> a
+    155:155:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):93:93 -> a
+    156:161:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):92:97 -> a
     162:162:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):62:62 -> a
-    162:162:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):96 -> a
-    163:167:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):124:128 -> a
-    168:168:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):134 -> a
-    168:168:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):128 -> a
-    169:171:com.android.tools.r8.graph.DexField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupFieldReference(com.android.tools.r8.graph.DexField):144:146 -> a
-    169:171:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):135 -> a
-    169:171:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):128 -> a
-    172:172:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):137:137 -> a
-    172:172:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):128 -> a
+    162:162:com.android.tools.r8.graph.DexProgramClass fixupClass(com.android.tools.r8.graph.DexProgramClass):97 -> a
+    163:167:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):125:129 -> a
+    168:168:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):135 -> a
+    168:168:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):129 -> a
+    169:171:com.android.tools.r8.graph.DexField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupFieldReference(com.android.tools.r8.graph.DexField):145:147 -> a
+    169:171:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):136 -> a
+    169:171:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):129 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):138:138 -> a
+    172:172:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):129 -> a
     173:173:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):54:54 -> a
-    173:173:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):137 -> a
-    173:173:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):128 -> a
-    174:174:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):138:138 -> a
-    174:174:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):128 -> a
-    175:175:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):128:128 -> a
-    176:180:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):174:178 -> a
-    181:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):185:188 -> a
-    181:184:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):179 -> a
+    173:173:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):138 -> a
+    173:173:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):129 -> a
+    174:174:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupField(com.android.tools.r8.graph.DexEncodedField):139:139 -> a
+    174:174:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):129 -> a
+    175:175:com.android.tools.r8.graph.DexEncodedField[] fixupFields(java.util.List):129:129 -> a
+    176:180:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):175:179 -> a
+    181:184:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):186:189 -> a
+    181:184:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):180 -> a
     185:185:void com.android.tools.r8.repackaging.RepackagingLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):58:58 -> a
-    185:185:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):188 -> a
-    185:185:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):179 -> a
-    186:186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):189:189 -> a
-    186:186:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):179 -> a
-    187:187:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):179:179 -> a
-    188:190:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):195:197 -> a
-    191:196:com.android.tools.r8.graph.DexProto com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):224:229 -> a
-    191:196:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):197 -> a
-    197:197:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod) -> a
-    198:208:java.util.Collection fixupSynthesizedFrom(java.util.Collection):236:246 -> a
-    209:209:com.android.tools.r8.graph.DexProgramClass lambda$fixupSynthesizedFrom$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):245:245 -> a
-    210:219:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):257:266 -> a
-    220:224:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):273:277 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):54:54 -> b
-com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.Zw:
+    185:185:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):189 -> a
+    185:185:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):180 -> a
+    186:186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):190:190 -> a
+    186:186:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):180 -> a
+    187:187:com.android.tools.r8.graph.DexEncodedMethod[] fixupMethods(java.lang.Iterable,int):180:180 -> a
+    188:190:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):196:198 -> a
+    191:196:com.android.tools.r8.graph.DexProto com.android.tools.r8.repackaging.RepackagingTreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):225:230 -> a
+    191:196:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):198 -> a
+    197:197:com.android.tools.r8.graph.DexMethod fixupMethodReference(com.android.tools.r8.graph.DexMethod):198:198 -> a
+    198:212:java.util.Collection fixupSynthesizedFrom(java.util.Collection):237:251 -> a
+    213:213:com.android.tools.r8.graph.DexProgramClass lambda$fixupSynthesizedFrom$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):250:250 -> a
+    214:223:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):262:271 -> a
+    224:228:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):278:282 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):55:55 -> b
+com.android.tools.r8.repackaging.RepackagingUseRegistry -> com.android.tools.r8.internal.sx:
     com.android.tools.r8.graph.InitClassLens initClassLens -> g
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> d
     com.android.tools.r8.graph.ProgramDefinition context -> f
@@ -68424,7 +68850,7 @@
     20:25:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult):107 -> a
     26:26:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult):108:108 -> a
     27:37:void registerTypeAccess(com.android.tools.r8.graph.DexType,java.util.function.Consumer):118:128 -> a
-    38:38:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():123:123 -> a
+    38:38:com.android.tools.r8.graph.ClassAccessFlags com.android.tools.r8.graph.DexClass.getAccessFlags():125:125 -> a
     38:38:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.DexProgramClass):52 -> a
     39:43:boolean isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.DexProgramClass):53:57 -> a
     44:48:void registerTypeAccess(com.android.tools.r8.graph.DexClass,java.util.function.Predicate):140:144 -> a
@@ -68438,21 +68864,21 @@
     1:1:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerFieldAccess(com.android.tools.r8.graph.DexField):76:76 -> c
     1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):186 -> c
     2:2:void registerTypeAccess(com.android.tools.r8.graph.DexClass):133:133 -> c
-    3:3:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):166:166 -> c
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):151:151 -> d
-    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):176:176 -> d
+    3:3:void registerInitClass(com.android.tools.r8.graph.DexType):151:151 -> c
+    4:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):166:166 -> c
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):176:176 -> d
+    2:2:void registerInstanceOf(com.android.tools.r8.graph.DexType):211:211 -> d
     1:1:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerFieldAccess(com.android.tools.r8.graph.DexField):76:76 -> e
     1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):196 -> e
     2:2:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):156:156 -> e
-    3:3:void registerInstanceOf(com.android.tools.r8.graph.DexType):211:211 -> e
+    3:3:void registerNewInstance(com.android.tools.r8.graph.DexType):191:191 -> e
     1:4:com.android.tools.r8.graph.ProgramMethod registerMethodReference(com.android.tools.r8.graph.DexMethod):80:83 -> f
-    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):191:191 -> f
+    5:5:void registerTypeReference(com.android.tools.r8.graph.DexType):206:206 -> f
     1:1:void com.android.tools.r8.repackaging.RepackagingUseRegistry.registerFieldAccess(com.android.tools.r8.graph.DexField):76:76 -> g
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):201 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):206:206 -> g
-    1:1:void lambda$registerInnerClassAttribute$2(com.android.tools.r8.graph.DexType):236:236 -> h
+    2:2:void lambda$registerInnerClassAttribute$2(com.android.tools.r8.graph.DexType):236:236 -> g
+    1:1:void registerTypeAccess(com.android.tools.r8.graph.DexType):114:114 -> h
     1:1:void registerFieldAccess(com.android.tools.r8.graph.DexField):76:76 -> i
-    2:2:void registerTypeAccess(com.android.tools.r8.graph.DexType):114:114 -> i
 com.android.tools.r8.retrace.InvalidMappingFileException -> com.android.tools.r8.retrace.InvalidMappingFileException:
     1:1:void <init>(java.lang.Throwable):13:13 -> <init>
 com.android.tools.r8.retrace.Retrace -> com.android.tools.r8.retrace.Retrace:
@@ -68560,7 +68986,7 @@
 com.android.tools.r8.retrace.StackTraceElementProxy -> com.android.tools.r8.retrace.StackTraceElementProxy:
     1:1:void <init>():11:11 -> <init>
 com.android.tools.r8.retrace.internal.Definition -> com.android.tools.r8.retrace.internal.a:
-com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.N8:
+com.android.tools.r8.retrace.internal.DirectClassNameMapperProguardMapProducer -> com.android.tools.r8.internal.W8:
     com.android.tools.r8.naming.ClassNameMapper getClassNameMapper() -> a
 com.android.tools.r8.retrace.internal.FieldDefinition -> com.android.tools.r8.retrace.internal.e:
     1:1:void <init>():13:13 -> <init>
@@ -68646,7 +69072,7 @@
     102:102:void forEach(java.util.function.Consumer):31:31 -> forEach
     103:104:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy parseLine(int,java.lang.String):212:213 -> forEach
     103:104:void forEach(java.util.function.Consumer):31 -> forEach
-com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.jx:
+com.android.tools.r8.retrace.internal.RetraceAbortException -> com.android.tools.r8.internal.Cx:
     1:1:void <init>():7:7 -> <init>
 com.android.tools.r8.retrace.internal.RetraceClassResultImpl -> com.android.tools.r8.retrace.internal.j:
     com.android.tools.r8.naming.ClassNamingForNameMapper mapper -> c
@@ -68759,7 +69185,7 @@
     17:17:com.android.tools.r8.retrace.RetraceSourceFileResult retraceSourceFile(java.lang.String):208 -> retraceSourceFile
 com.android.tools.r8.retrace.internal.RetraceClassResultImpl$ResultConstructor -> com.android.tools.r8.retrace.internal.k:
     java.lang.Object create(com.android.tools.r8.retrace.internal.RetraceClassResultImpl,java.util.List,java.lang.Object,com.android.tools.r8.retrace.internal.RetracerImpl) -> a
-com.android.tools.r8.retrace.internal.RetraceCommandLineResult -> com.android.tools.r8.internal.kx:
+com.android.tools.r8.retrace.internal.RetraceCommandLineResult -> com.android.tools.r8.internal.Dx:
     java.util.List nodes -> a
     1:2:void <init>(java.util.List):13:14 -> <init>
     1:1:java.util.List getNodes():18:18 -> a
@@ -69033,7 +69459,7 @@
     7:75:java.util.stream.Stream stream():34 -> stream
     76:83:java.util.stream.Stream stream():34:41 -> stream
     84:84:java.util.stream.Stream stream():30:30 -> stream
-com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.lx:
+com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl -> com.android.tools.r8.internal.Ex:
     com.android.tools.r8.retrace.internal.RetracedTypeImpl retracedType -> a
     1:2:void <init>(com.android.tools.r8.retrace.internal.RetracedTypeImpl):59:60 -> <init>
     1:1:com.android.tools.r8.retrace.internal.RetracedTypeImpl com.android.tools.r8.retrace.internal.RetraceTypeResultImpl$ElementImpl.getType():65:65 -> getType
@@ -69359,7 +69785,7 @@
     1:1:boolean hasMethodArguments():93:93 -> hasMethodArguments
     1:1:boolean hasMethodName():68:68 -> hasMethodName
 com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$1 -> com.android.tools.r8.retrace.internal.J:
-com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.Ay:
+com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType -> com.android.tools.r8.internal.Ty:
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType BINARY -> a
     com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassNameType TYPENAME -> b
     1:2:void <clinit>():168:169 -> <clinit>
@@ -69421,7 +69847,7 @@
     1:1:com.android.tools.r8.utils.TriFunction access$100(com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$StringIndex):325:325 -> a
     2:2:boolean hasIndex():358:358 -> a
     1:1:com.android.tools.r8.retrace.internal.StackTraceElementStringProxy$ClassStringIndex noIndex():331:331 -> b
-com.android.tools.r8.retrace.internal.StackTraceVisitor -> com.android.tools.r8.internal.By:
+com.android.tools.r8.retrace.internal.StackTraceVisitor -> com.android.tools.r8.internal.Uy:
 com.android.tools.r8.shaking.AbstractMethodRemover -> com.android.tools.r8.shaking.a:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.ScopedDexMethodSet scope -> d
@@ -69432,7 +69858,7 @@
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):30:34 -> <init>
     1:2:void run():38:39 -> a
     3:3:void processClass(com.android.tools.r8.graph.DexType):43:43 -> a
-    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    4:4:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     4:4:void processClass(com.android.tools.r8.graph.DexType):43 -> a
     5:8:void processClass(com.android.tools.r8.graph.DexType):44:47 -> a
     9:14:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):19:24 -> a
@@ -69577,7 +70003,7 @@
     30:30:void com.android.tools.r8.shaking.ProguardKeepAttributes.ensureValid(boolean):164:164 -> b
     30:30:com.android.tools.r8.shaking.AnnotationRemover ensureValid():168 -> b
     31:31:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):250:250 -> b
-    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    32:32:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     32:32:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):250 -> b
     33:37:com.android.tools.r8.graph.DexAnnotationElement rewriteAnnotationElement(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotationElement):256:260 -> b
     1:1:java.util.Set getClassesToRetainInnerClassAttributeFor():55:55 -> c
@@ -69595,258 +70021,271 @@
     56:56:void retainAnnotation(com.android.tools.r8.graph.DexAnnotation):424:424 -> a
     57:58:com.android.tools.r8.shaking.AnnotationRemover build(com.android.tools.r8.graph.AppView,java.util.Set):429:430 -> a
 com.android.tools.r8.shaking.AppInfoWithLiveness -> com.android.tools.r8.shaking.e:
-    java.util.Set prunedTypes -> T
+    java.util.Map initClassReferences -> R
+    com.android.tools.r8.shaking.SingleTargetLookupCache singleTargetLookupCache -> X
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> s
+    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> T
+    com.android.tools.r8.graph.EnumValueInfoMapCollection enumValueInfoMaps -> W
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> u
-    java.util.SortedSet liveMethods -> t
+    java.util.Map switchMaps -> V
     java.util.Map assumedValues -> B
     java.util.Set keepUnusedArguments -> H
-    java.util.SortedSet methodsTargetedByInvokeDynamic -> r
     java.util.Set neverReprocess -> J
     com.android.tools.r8.graph.MethodAccessInfoCollection methodAccessInfoCollection -> v
     java.util.Set forceInline -> D
     java.util.Set whyAreYouNotInlining -> F
-    java.util.Set constClassReferences -> P
-    java.util.Set neverPropagateValue -> R
+    java.util.Set targetedMethods -> o
+    java.util.Set noStaticClassMerging -> P
+    java.util.Set bootstrapMethods -> q
     java.util.Set deadProtoTypes -> k
     java.util.Set neverClassInline -> L
     java.util.Set liveTypes -> m
-    com.android.tools.r8.cf.CfVersion largestInputCfVersion -> X
-    java.util.Set noHorizontalClassMerging -> N
-    java.util.Map initClassReferences -> Q
-    com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap identifierNameStrings -> S
-    com.android.tools.r8.shaking.SingleTargetLookupCache singleTargetLookupCache -> W
+    java.util.Set noVerticalClassMerging -> N
+    java.util.Set neverPropagateValue -> S
     boolean $assertionsDisabled -> j
-    com.android.tools.r8.graph.EnumValueInfoMapCollection enumValueInfoMaps -> V
+    java.util.Set liveMethods -> t
+    java.util.Set prunedTypes -> U
     java.util.Map mayHaveSideEffects -> z
-    java.util.Map switchMaps -> U
     java.util.Map callSites -> x
     java.util.Map noSideEffects -> A
     java.util.Set keepConstantArguments -> G
     java.util.Set reprocess -> I
-    java.util.SortedSet virtualMethodsTargetedByInvokeDirect -> s
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> K
     java.util.Set alwaysInline -> C
-    java.util.SortedSet bootstrapMethods -> q
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl objectAllocationInfoCollection -> w
     java.util.Set neverInline -> E
-    java.util.SortedSet targetedMethods -> o
-    java.util.Set noStaticClassMerging -> O
+    java.util.Set noHorizontalClassMerging -> O
     java.util.Set failedResolutionTargets -> p
+    java.util.Set lockCandidates -> Q
+    java.util.Set methodsTargetedByInvokeDynamic -> r
     java.util.Set missingTypes -> l
     com.android.tools.r8.shaking.KeepInfoCollection keepInfo -> y
-    java.util.Set noVerticalClassMerging -> M
+    java.util.Set noUnusedInterfaceRemoval -> M
     java.util.Set instantiatedAppServices -> n
+    com.android.tools.r8.cf.CfVersion largestInputCfVersion -> Y
     1:1:void <clinit>():80:80 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):239:239 -> <init>
-    2:381:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):194:573 -> <init>
-    382:419:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.SortedSet,java.util.Set,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,java.util.SortedSet,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):240:277 -> <init>
-    420:422:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):507:509 -> <init>
-    423:423:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):506:506 -> <init>
-    424:803:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):194:573 -> <init>
-    804:842:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):510:548 -> <init>
-    1:1:java.util.Set getNoStaticClassMergingSet():1427:1427 -> A
-    1:1:java.util.Set getNoVerticalClassMergingSet():1411:1411 -> B
-    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():751:751 -> C
-    1:2:java.util.Set getPrunedTypes():1059:1060 -> D
-    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():552:552 -> E
+    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):244:244 -> <init>
+    2:388:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):198:584 -> <init>
+    389:427:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.features.ClassToFeatureSplitMap,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.MethodAccessInfoCollection,com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl,java.util.Map,com.android.tools.r8.shaking.KeepInfoCollection,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,java.util.Set,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection,java.util.Set,java.util.Map):245:283 -> <init>
+    428:430:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):517:519 -> <init>
+    431:431:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):516:516 -> <init>
+    432:818:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):198:584 -> <init>
+    819:858:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Map,com.android.tools.r8.graph.EnumValueInfoMapCollection):520:559 -> <init>
+    1:1:java.util.Set getNoHorizontalClassMergingSet():1484:1484 -> A
+    1:1:java.util.Set getNoStaticClassMergingSet():1492:1492 -> B
+    1:1:java.util.Set getNoVerticalClassMergingSet():1476:1476 -> C
+    1:1:com.android.tools.r8.graph.ObjectAllocationInfoCollection getObjectAllocationInfoCollection():810:810 -> D
+    1:2:java.util.Set getPrunedTypes():1119:1120 -> E
+    1:1:java.util.Set getVirtualMethodsTargetedByInvokeDirect():655:655 -> F
+    1:1:boolean hasNoAlwaysInlineMethods():663:663 -> G
+    1:1:boolean hasNoForceInlineMethods():671:671 -> H
+    1:1:com.android.tools.r8.shaking.AppInfoWithLivenessModifier modifier():563:563 -> I
     void lambda$prunedCopyFrom$5(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder) -> a
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    1:1:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):576 -> a
-    2:2:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):579:579 -> a
-    3:13:void computeLargestCfVersion():586:596 -> a
-    3:13:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):580 -> a
-    14:14:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):582:582 -> a
-    15:18:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):467:470 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    1:1:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):587 -> a
+    2:2:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):590:590 -> a
+    3:13:void computeLargestCfVersion():597:607 -> a
+    3:13:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):591 -> a
+    14:14:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):593:593 -> a
+    15:18:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):477:480 -> a
     19:463:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):0:444 -> a
-    19:463:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):470 -> a
-    464:464:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):468:468 -> a
-    465:465:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):472:472 -> a
+    19:463:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):480 -> a
+    464:464:com.android.tools.r8.shaking.KeepInfoCollection extendPinnedItems(com.android.tools.r8.shaking.AppInfoWithLiveness,java.util.Collection):478:478 -> a
+    465:465:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):482:482 -> a
     466:466:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    466:466:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):473 -> a
-    467:482:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):475:490 -> a
+    466:466:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):483 -> a
+    467:482:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):485:500 -> a
     483:483:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218:218 -> a
-    483:483:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):492 -> a
+    483:483:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):502 -> a
     484:484:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):227:227 -> a
     484:484:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218 -> a
-    484:484:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):492 -> a
-    485:485:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):494:494 -> a
-    486:519:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):658:691 -> a
-    520:520:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):661:661 -> a
-    521:521:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):760:760 -> a
-    522:523:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):785:786 -> a
-    524:524:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> a
-    524:524:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):787 -> a
-    525:529:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):787:791 -> a
+    484:484:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):502 -> a
+    485:485:void lambda$extendPinnedItems$0(java.util.Collection,com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):504:504 -> a
+    486:519:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):717:750 -> a
+    520:520:java.util.Set lookupLambdaImplementedMethods(com.android.tools.r8.graph.DexCallSite):720:720 -> a
+    521:521:void removeFromSingleTargetLookupCache(com.android.tools.r8.graph.DexClass):819:819 -> a
+    522:523:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):844:845 -> a
+    524:524:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():796:796 -> a
+    524:524:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):846 -> a
+    525:529:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):846:850 -> a
     530:530:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexDefinitionSupplier):147:147 -> a
-    530:530:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):791 -> a
-    531:535:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):796:800 -> a
-    536:538:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):825:827 -> a
-    539:539:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> a
-    539:539:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):830 -> a
-    540:543:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):830:833 -> a
-    544:548:boolean mayPropagateArgumentsTo(com.android.tools.r8.graph.ProgramMethod):861:865 -> a
-    549:550:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):919:920 -> a
-    551:554:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$4(com.android.tools.r8.graph.ProgramMember):933:936 -> a
-    555:555:boolean isPinned(com.android.tools.r8.graph.DexDefinition):947:947 -> a
-    555:555:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):910 -> a
-    556:556:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
-    556:556:boolean isPinned(com.android.tools.r8.graph.DexDefinition):948 -> a
-    556:556:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):910 -> a
-    557:557:boolean isPinned(com.android.tools.r8.graph.DexDefinition):948:948 -> a
-    557:557:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):910 -> a
-    558:558:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):910:910 -> a
-    559:563:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):976:980 -> a
+    530:530:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):850 -> a
+    531:535:boolean isFieldRead(com.android.tools.r8.graph.DexEncodedField):855:859 -> a
+    536:538:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):884:886 -> a
+    539:539:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():796:796 -> a
+    539:539:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):889 -> a
+    540:543:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):889:892 -> a
+    544:548:boolean mayPropagateArgumentsTo(com.android.tools.r8.graph.ProgramMethod):920:924 -> a
+    549:550:boolean isAccessModificationAllowed(com.android.tools.r8.graph.DexReference):978:979 -> a
+    551:554:com.android.tools.r8.utils.TraversalContinuation lambda$isRepackagingAllowed$4(com.android.tools.r8.graph.ProgramMember):992:995 -> a
+    555:555:boolean isPinned(com.android.tools.r8.graph.DexDefinition):1006:1006 -> a
+    555:555:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):969 -> a
+    556:556:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():546:546 -> a
+    556:556:boolean isPinned(com.android.tools.r8.graph.DexDefinition):1007 -> a
+    556:556:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):969 -> a
+    557:557:boolean isPinned(com.android.tools.r8.graph.DexDefinition):1007:1007 -> a
+    557:557:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):969 -> a
+    558:558:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):969:969 -> a
+    559:563:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):1035:1039 -> a
     564:1008:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):0:444 -> a
-    564:1008:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):980 -> a
-    1009:1009:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):982:982 -> a
-    1010:1050:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):417:457 -> a
-    1010:1050:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):982 -> a
-    1051:1097:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):416:462 -> a
-    1051:1097:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):982 -> a
-    1098:1098:void lambda$prunedCopyFrom$6(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):980:980 -> a
-    1099:1099:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):987:987 -> a
-    1100:1105:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems,java.util.Set):368:373 -> a
-    1100:1105:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):987 -> a
-    1106:1106:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems,java.util.Set):372:372 -> a
-    1106:1106:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):987 -> a
-    1107:1107:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems,java.util.Set):366:366 -> a
-    1107:1107:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):987 -> a
-    1108:1116:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):992:1000 -> a
-    1117:1160:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):995:1038 -> a
-    1161:1163:java.util.Set com.android.tools.r8.graph.GraphLens.rewriteReferences(java.util.Set):518:520 -> a
-    1161:1163:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1039 -> a
-    1164:1164:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1039:1039 -> a
-    1165:1167:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLens.rewriteReferenceKeys(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):532:534 -> a
-    1165:1167:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1040 -> a
-    1168:1174:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1040:1046 -> a
-    1175:1180:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1068:1073 -> a
-    1175:1180:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1181:1182:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1111:1112 -> a
-    1181:1182:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1075 -> a
-    1181:1182:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1183:1183:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):461:461 -> a
-    1183:1183:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1083 -> a
-    1183:1183:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1184:1184:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1081:1081 -> a
-    1184:1184:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1185:1186:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1111:1112 -> a
-    1185:1186:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1077 -> a
-    1185:1186:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1187:1187:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1079:1079 -> a
-    1187:1187:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1188:1647:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:459 -> a
-    1188:1647:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1094 -> a
-    1648:1649:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1100:1101 -> a
-    1650:1681:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1123:1154 -> a
-    1682:1682:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
-    1682:1682:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1155 -> a
-    1683:1684:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1155:1156 -> a
-    1685:1693:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1220:1228 -> a
-    1685:1693:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1161 -> a
-    1694:1708:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1226:1240 -> a
-    1694:1708:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1161 -> a
-    1709:1721:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1166:1178 -> a
-    1722:1742:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1177:1197 -> a
-    1743:1753:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1196:1206 -> a
-    1754:1756:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1247:1249 -> a
-    1757:1759:com.android.tools.r8.shaking.AppInfoWithLiveness withEnumValueInfoMaps(com.android.tools.r8.graph.EnumValueInfoMapCollection):1253:1255 -> a
-    1760:1785:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1287:1312 -> a
-    1786:1786:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1288:1288 -> a
-    1787:1787:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1324:1324 -> a
-    1788:1789:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1334:1335 -> a
-    1790:1790:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1343:1343 -> a
-    1790:1790:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1336 -> a
-    1791:1792:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):893:894 -> a
-    1791:1792:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1343 -> a
-    1791:1792:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1336 -> a
-    1793:1793:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1337:1337 -> a
-    1794:1803:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1347:1356 -> a
-    1804:1816:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1365:1377 -> a
-    1817:1817:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$11(com.android.tools.r8.ir.desugar.LambdaDescriptor):1400:1400 -> a
-    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):764:768 -> b
-    6:246:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:240 -> b
-    6:246:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):768 -> b
-    247:247:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):769:769 -> b
-    248:248:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
-    248:248:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):771 -> b
-    249:249:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):771:771 -> b
-    250:251:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):804:805 -> b
-    252:252:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):849:849 -> b
-    253:253:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):914:914 -> b
-    254:254:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> b
-    254:254:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):914 -> b
-    255:256:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):914:915 -> b
-    257:261:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1274:1274 -> b
-    1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):557:560 -> c
-    5:802:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:797 -> c
-    5:802:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):562 -> c
-    803:803:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):831:831 -> c
-    803:803:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):563 -> c
-    804:804:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):801:801 -> c
-    804:804:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):564 -> c
-    805:805:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):565:565 -> c
-    806:886:boolean com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter.isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):0:80 -> c
-    806:886:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):566 -> c
-    887:988:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:101 -> c
-    887:988:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):568 -> c
-    989:989:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):558:558 -> c
-    990:990:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):756:756 -> c
-    991:992:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):780:781 -> c
-    993:994:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):775:776 -> c
-    993:994:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):781 -> c
-    995:996:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):809:810 -> c
-    997:997:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> c
-    997:997:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):811 -> c
-    998:1008:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):811:821 -> c
-    1009:1010:boolean isPinned(com.android.tools.r8.graph.DexReference):942:943 -> c
-    1011:1011:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> c
-    1011:1011:boolean isPinned(com.android.tools.r8.graph.DexReference):943 -> c
-    1:3:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo getEnumValueInfo(com.android.tools.r8.graph.DexField):725:727 -> d
-    4:5:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):775:776 -> d
-    6:8:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):837:839 -> d
-    9:9:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> d
-    9:9:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):842 -> d
-    10:15:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):842:847 -> d
-    16:17:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):869:870 -> d
-    18:19:boolean isPinned(com.android.tools.r8.graph.DexReference):942:943 -> d
-    18:19:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):871 -> d
-    20:20:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> d
-    20:20:boolean isPinned(com.android.tools.r8.graph.DexReference):943 -> d
-    20:20:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):871 -> d
-    21:22:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):871:872 -> d
-    1:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):731:732 -> e
-    3:3:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):876:876 -> e
-    4:4:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> e
-    4:4:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):877 -> e
-    5:5:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> e
-    5:5:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):877 -> e
-    6:7:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):893:894 -> e
-    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):600:600 -> f
-    2:6:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):853:857 -> f
-    1:7:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):924:930 -> g
-    8:12:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):241:245 -> g
-    8:12:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):931 -> g
-    13:13:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):938:938 -> g
-    1:2:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap getEnumValueInfoMap(com.android.tools.r8.graph.DexType):720:721 -> h
-    3:13:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$10(com.android.tools.r8.graph.DexProgramClass):1386:1396 -> h
-    1:1:boolean hasLiveness():899:899 -> i
-    2:6:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):952:956 -> i
-    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):609:616 -> j
-    1:1:com.android.tools.r8.graph.DexProgramClass lambda$forEachTypeInHierarchyOfLiveProgramClasses$8(com.android.tools.r8.graph.DexType):1276:1276 -> k
+    564:1008:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):1039 -> a
+    1009:1009:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):1041:1041 -> a
+    1010:1051:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):426:467 -> a
+    1010:1051:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):1041 -> a
+    1052:1099:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):425:472 -> a
+    1052:1099:com.android.tools.r8.shaking.AppInfoWithLiveness prunedCopyFrom(com.android.tools.r8.graph.DirectMappedDexApplication,java.util.Set,java.util.Collection):1041 -> a
+    1100:1100:void lambda$prunedCopyFrom$6(java.util.Set,com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):1039:1039 -> a
+    1101:1101:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):1046:1046 -> a
+    1102:1107:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems,java.util.Set):376:381 -> a
+    1102:1107:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):1046 -> a
+    1108:1108:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems,java.util.Set):380:380 -> a
+    1108:1108:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):1046 -> a
+    1109:1109:void <init>(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.synthesis.CommittedItems,java.util.Set):374:374 -> a
+    1109:1109:com.android.tools.r8.shaking.AppInfoWithLiveness rebuildWithLiveness(com.android.tools.r8.synthesis.CommittedItems,java.util.Set):1046 -> a
+    1110:1118:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1051:1059 -> a
+    1119:1163:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1054:1098 -> a
+    1164:1166:java.util.Set com.android.tools.r8.graph.GraphLens.rewriteReferences(java.util.Set):518:520 -> a
+    1164:1166:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1099 -> a
+    1167:1167:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1099:1099 -> a
+    1168:1170:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap com.android.tools.r8.graph.GraphLens.rewriteReferenceKeys(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):532:534 -> a
+    1168:1170:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1100 -> a
+    1171:1177:com.android.tools.r8.shaking.AppInfoWithLiveness rewrittenWithLens(com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):1100:1106 -> a
+    1178:1183:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1128:1133 -> a
+    1178:1183:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1154 -> a
+    1184:1185:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1171:1172 -> a
+    1184:1185:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1135 -> a
+    1184:1185:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1154 -> a
+    1186:1186:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.AppInfoWithClassHierarchy.lookupSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):461:461 -> a
+    1186:1186:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1143 -> a
+    1186:1186:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1154 -> a
+    1187:1187:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1141:1141 -> a
+    1187:1187:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1154 -> a
+    1188:1189:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate):1171:1172 -> a
+    1188:1189:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1137 -> a
+    1188:1189:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1154 -> a
+    1190:1190:com.android.tools.r8.graph.DexEncodedMethod lookupSingleTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1139:1139 -> a
+    1190:1190:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1154 -> a
+    1191:1654:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.graph.DexEncodedMethod.asProgramMethodOrNull(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexDefinitionSupplier):0:463 -> a
+    1191:1654:com.android.tools.r8.graph.ProgramMethod lookupSingleProgramTarget(com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.LibraryModeledPredicate):1154 -> a
+    1655:1656:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean):1160:1161 -> a
+    1657:1688:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1183:1214 -> a
+    1689:1689:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
+    1689:1689:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1215 -> a
+    1690:1691:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1215:1216 -> a
+    1692:1700:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1280:1288 -> a
+    1692:1700:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1221 -> a
+    1701:1715:com.android.tools.r8.graph.DexEncodedMethod getMethodTargetFromExactRuntimeInformation(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement,com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.DexClass):1286:1300 -> a
+    1701:1715:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1221 -> a
+    1716:1728:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1226:1238 -> a
+    1729:1749:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1237:1257 -> a
+    1750:1760:com.android.tools.r8.graph.DexEncodedMethod lookupSingleVirtualTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,boolean,com.android.tools.r8.shaking.LibraryModeledPredicate,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.analysis.type.ClassTypeElement):1256:1266 -> a
+    1761:1763:com.android.tools.r8.shaking.AppInfoWithLiveness withSwitchMaps(java.util.Map):1307:1309 -> a
+    1764:1766:com.android.tools.r8.shaking.AppInfoWithLiveness withEnumValueInfoMaps(com.android.tools.r8.graph.EnumValueInfoMapCollection):1313:1315 -> a
+    1767:1792:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer,java.util.Collection,java.util.Set,com.android.tools.r8.graph.AppInfoWithClassHierarchy):1347:1372 -> a
+    1793:1793:void lambda$forEachTypeInHierarchyOfLiveProgramClasses$9(java.util.Set,com.android.tools.r8.graph.DexProgramClass):1348:1348 -> a
+    1794:1794:void forEachInstantiatedSubType(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):1384:1384 -> a
+    1795:1796:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1394:1395 -> a
+    1797:1797:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1403:1403 -> a
+    1797:1797:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1396 -> a
+    1798:1799:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):952:953 -> a
+    1798:1799:boolean isInstantiatedOrPinned(com.android.tools.r8.graph.DexProgramClass):1403 -> a
+    1798:1799:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1396 -> a
+    1800:1800:void forEachInstantiatedSubTypeInChain(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.function.Consumer,java.util.function.Consumer):1397:1397 -> a
+    1801:1810:boolean isPinnedNotProgramOrLibraryOverride(com.android.tools.r8.graph.DexDefinition):1407:1416 -> a
+    1811:1823:boolean mayHaveFinalizeMethodDirectlyOrIndirectly(com.android.tools.r8.ir.analysis.type.ClassTypeElement):1425:1437 -> a
+    1824:1824:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$11(com.android.tools.r8.ir.desugar.LambdaDescriptor):1460:1460 -> a
+    1:5:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):823:827 -> b
+    6:244:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:238 -> b
+    6:244:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):827 -> b
+    245:245:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):828:828 -> b
+    246:246:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> b
+    246:246:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):830 -> b
+    247:247:boolean isInstantiatedDirectly(com.android.tools.r8.graph.DexProgramClass):830:830 -> b
+    248:249:boolean isFieldWritten(com.android.tools.r8.graph.DexEncodedField):863:864 -> b
+    250:250:boolean lambda$isInstanceFieldWrittenOnlyInInstanceInitializers$1(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):908:908 -> b
+    251:251:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):973:973 -> b
+    252:252:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> b
+    252:252:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):973 -> b
+    253:254:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):973:974 -> b
+    255:259:void forEachTypeInHierarchyOfLiveProgramClasses(java.util.function.Consumer):1334:1334 -> b
+    1:4:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):568:571 -> c
+    5:822:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isCompanionClassType(com.android.tools.r8.graph.DexType):0:817 -> c
+    5:822:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):573 -> c
+    823:823:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.hasDispatchClassSuffix(com.android.tools.r8.graph.DexType):851:851 -> c
+    823:823:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):574 -> c
+    824:824:boolean com.android.tools.r8.ir.desugar.InterfaceMethodRewriter.isEmulatedLibraryClassType(com.android.tools.r8.graph.DexType):821:821 -> c
+    824:824:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):575 -> c
+    825:825:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):576:576 -> c
+    826:906:boolean com.android.tools.r8.ir.desugar.TwrCloseResourceRewriter.isUtilityClassDescriptor(com.android.tools.r8.graph.DexType):0:80 -> c
+    826:906:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):577 -> c
+    907:1008:boolean com.android.tools.r8.ir.desugar.DesugaredLibraryAPIConverter.isVivifiedType(com.android.tools.r8.graph.DexType):0:101 -> c
+    907:1008:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):579 -> c
+    1009:1009:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):569:569 -> c
+    1010:1010:void mutateObjectAllocationInfoCollection(java.util.function.Consumer):815:815 -> c
+    1011:1012:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):839:840 -> c
+    1013:1014:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):834:835 -> c
+    1013:1014:boolean isInstantiatedDirectlyOrIndirectly(com.android.tools.r8.graph.DexProgramClass):840 -> c
+    1015:1016:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):868:869 -> c
+    1017:1017:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():796:796 -> c
+    1017:1017:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):870 -> c
+    1018:1028:boolean isFieldWrittenByFieldPutInstruction(com.android.tools.r8.graph.DexEncodedField):870:880 -> c
+    1029:1030:boolean isPinned(com.android.tools.r8.graph.DexReference):1001:1002 -> c
+    1031:1031:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> c
+    1031:1031:boolean isPinned(com.android.tools.r8.graph.DexReference):1002 -> c
+    1:1:boolean isAlwaysInlineMethod(com.android.tools.r8.graph.DexMethod):659:659 -> d
+    2:4:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfo getEnumValueInfo(com.android.tools.r8.graph.DexField):784:786 -> d
+    5:6:boolean isInstantiatedIndirectly(com.android.tools.r8.graph.DexProgramClass):834:835 -> d
+    7:9:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):896:898 -> d
+    10:10:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():796:796 -> d
+    10:10:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):901 -> d
+    11:16:boolean isInstanceFieldWrittenOnlyInInstanceInitializers(com.android.tools.r8.graph.DexEncodedField):901:906 -> d
+    17:18:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):928:929 -> d
+    19:20:boolean isPinned(com.android.tools.r8.graph.DexReference):1001:1002 -> d
+    19:20:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):930 -> d
+    21:21:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> d
+    21:21:boolean isPinned(com.android.tools.r8.graph.DexReference):1002 -> d
+    21:21:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):930 -> d
+    22:23:boolean mayPropagateValueFor(com.android.tools.r8.graph.DexReference):930:931 -> d
+    1:1:boolean isBootstrapMethod(com.android.tools.r8.graph.DexMethod):647:647 -> e
+    2:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceMap getSwitchMap(com.android.tools.r8.graph.DexField):790:791 -> e
+    4:4:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):935:935 -> e
+    5:5:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> e
+    5:5:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):936 -> e
+    6:6:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> e
+    6:6:boolean isLibraryOrClasspathField(com.android.tools.r8.graph.DexEncodedField):936 -> e
+    7:8:boolean isInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):952:953 -> e
+    1:1:boolean isLiveProgramClass(com.android.tools.r8.graph.DexProgramClass):611:611 -> f
+    2:2:boolean isFailedResolutionTarget(com.android.tools.r8.graph.DexMethod):639:639 -> f
+    3:7:boolean isStaticFieldWrittenOnlyInEnclosingStaticInitializer(com.android.tools.r8.graph.DexEncodedField):912:916 -> f
+    1:1:boolean isForceInlineMethod(com.android.tools.r8.graph.DexMethod):667:667 -> g
+    2:8:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):983:989 -> g
+    9:13:com.android.tools.r8.utils.TraversalContinuation com.android.tools.r8.graph.DexProgramClass.traverseProgramMembers(java.util.function.Function):241:245 -> g
+    9:13:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):990 -> g
+    14:14:boolean isRepackagingAllowed(com.android.tools.r8.graph.DexProgramClass):997:997 -> g
+    1:1:boolean isLiveMethod(com.android.tools.r8.graph.DexMethod):631:631 -> h
+    2:3:com.android.tools.r8.graph.EnumValueInfoMapCollection$EnumValueInfoMap getEnumValueInfoMap(com.android.tools.r8.graph.DexType):779:780 -> h
+    4:14:com.android.tools.r8.utils.TraversalContinuation lambda$mayHaveFinalizer$10(com.android.tools.r8.graph.DexProgramClass):1446:1456 -> h
+    1:1:boolean isMethodTargetedByInvokeDynamic(com.android.tools.r8.graph.DexMethod):651:651 -> i
+    2:2:boolean hasLiveness():958:958 -> i
+    3:7:boolean hasPinnedInstanceInitializer(com.android.tools.r8.graph.DexType):1011:1015 -> i
+    1:8:boolean isNonProgramTypeOrLiveProgramType(com.android.tools.r8.graph.DexType):620:627 -> j
+    9:9:boolean isNeverInlineMethod(com.android.tools.r8.graph.DexMethod):675:675 -> j
+    1:1:boolean isTargetedMethod(com.android.tools.r8.graph.DexMethod):635:635 -> k
+    2:2:com.android.tools.r8.graph.DexProgramClass lambda$forEachTypeInHierarchyOfLiveProgramClasses$8(com.android.tools.r8.graph.DexType):1336:1336 -> k
     boolean lambda$lookupSingleVirtualTarget$7(com.android.tools.r8.graph.DexType) -> l
-    1:22:boolean mayHaveFinalizer(com.android.tools.r8.graph.DexType):1382:1403 -> m
-    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):1054:1055 -> n
-    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():905:905 -> o
-    1:19:java.util.Collection computeReachableInterfaces():620:638 -> q
-    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1360:1360 -> r
-    1:1:java.util.Set getDeadProtoTypes():707:707 -> s
-    1:2:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumValueInfoMapCollection():715:716 -> t
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():737:737 -> u
-    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():965:965 -> v
-    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection getMethodAccessInfoCollection():746:746 -> w
-    1:1:java.util.Set getMissingTypes():711:711 -> x
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():741:741 -> y
-    1:1:java.util.Set getNoHorizontalClassMergingSet():1419:1419 -> z
+    1:22:boolean mayHaveFinalizer(com.android.tools.r8.graph.DexType):1442:1463 -> m
+    1:2:boolean wasPruned(com.android.tools.r8.graph.DexType):1114:1115 -> n
+    1:1:com.android.tools.r8.shaking.AppInfoWithLiveness withLiveness():964:964 -> o
+    1:19:java.util.Collection computeReachableInterfaces():679:697 -> q
+    1:1:com.android.tools.r8.graph.SubtypingInfo computeSubtypingInfo():1420:1420 -> r
+    1:1:java.util.Set getDeadProtoTypes():766:766 -> s
+    1:2:com.android.tools.r8.graph.EnumValueInfoMapCollection getEnumValueInfoMapCollection():774:775 -> t
+    1:1:java.util.Set getFailedResolutionTargets():643:643 -> u
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollection getFieldAccessInfoCollection():796:796 -> v
+    1:1:com.android.tools.r8.shaking.KeepInfoCollection getKeepInfo():1024:1024 -> w
+    1:1:com.android.tools.r8.graph.MethodAccessInfoCollection getMethodAccessInfoCollection():805:805 -> x
+    1:1:java.util.Set getMissingTypes():770:770 -> y
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl getMutableFieldAccessInfoCollection():800:800 -> z
 com.android.tools.r8.shaking.AppInfoWithLivenessModifier -> com.android.tools.r8.shaking.f:
     java.util.Set noLongerInstantiatedClasses -> a
     java.util.Set noLongerWrittenFields -> b
@@ -69860,7 +70299,7 @@
     11:11:void modify(com.android.tools.r8.shaking.AppInfoWithLiveness):50 -> a
     12:12:void lambda$modify$0(com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder):38:38 -> a
     13:15:void lambda$modify$1(com.android.tools.r8.graph.FieldAccessInfoCollectionImpl,com.android.tools.r8.graph.DexField):44:46 -> a
-com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.i5:
+com.android.tools.r8.shaking.ClassInitFieldSynthesizer -> com.android.tools.r8.internal.k5:
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.graph.DexField clinitField -> c
     boolean $assertionsDisabled -> a
@@ -69871,33 +70310,33 @@
     1:3:void run(java.util.concurrent.ExecutorService):37:37 -> a
     5:5:void run(java.util.concurrent.ExecutorService):39:39 -> a
     6:6:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):43:43 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     7:7:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):43 -> a
     8:15:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):43:50 -> a
-    16:16:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> a
+    16:16:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():188:188 -> a
     16:16:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):94 -> a
     16:16:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
     17:17:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):97:97 -> a
     17:17:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
-    18:18:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():175:175 -> a
+    18:18:boolean com.android.tools.r8.graph.DexEncodedField.isPackagePrivate():176:176 -> a
     18:18:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):101 -> a
     18:18:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
-    19:19:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():183:183 -> a
+    19:19:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():184:184 -> a
     19:19:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):101 -> a
     19:19:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
     20:20:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):105:105 -> a
     20:20:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
-    21:21:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():183:183 -> a
+    21:21:boolean com.android.tools.r8.graph.DexEncodedField.isProtected():184:184 -> a
     21:21:boolean com.android.tools.r8.shaking.ClassInitFieldSynthesizer.isMinimumRequiredVisibility(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.utils.Visibility):99 -> a
     21:21:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):52 -> a
     22:22:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):57:57 -> a
-    23:23:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():104:104 -> a
+    23:23:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():105:105 -> a
     23:23:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):64 -> a
     24:24:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):64:64 -> a
-    25:25:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():104:104 -> a
+    25:25:com.android.tools.r8.graph.FieldAccessFlags com.android.tools.r8.graph.DexEncodedField.getAccessFlags():105:105 -> a
     25:25:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):65 -> a
     26:26:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):65:65 -> a
-    27:27:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> a
+    27:27:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():188:188 -> a
     27:27:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):69 -> a
     28:38:void synthesizeClassInitField(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.Visibility):75:85 -> a
     39:39:void com.android.tools.r8.graph.DexEncodedField.<init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessFlags,com.android.tools.r8.graph.GenericSignature$FieldTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexValue):61:61 -> a
@@ -69923,7 +70362,7 @@
     1:2:void <clinit>():14:15 -> <clinit>
     3:3:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
-com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.K6:
+com.android.tools.r8.shaking.CollectingGraphConsumer -> com.android.tools.r8.internal.P6:
     java.util.Map target2sources -> b
     com.android.tools.r8.experimental.graphinfo.GraphConsumer subConsumer -> a
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):23:23 -> <init>
@@ -69934,7 +70373,7 @@
     1:1:java.util.Map lambda$acceptEdge$0(com.android.tools.r8.experimental.graphinfo.GraphNode):30:30 -> b
     1:1:java.util.Set lambda$acceptEdge$1(com.android.tools.r8.experimental.graphinfo.GraphNode):31:31 -> c
 com.android.tools.r8.shaking.ConsequentRootSetBuilder -> com.android.tools.r8.shaking.j:
-    com.android.tools.r8.shaking.Enqueuer enqueuer -> L
+    com.android.tools.r8.shaking.Enqueuer enqueuer -> M
     1:2:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer):18:19 -> <init>
     1:1:void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult):24:24 -> a
     2:2:boolean com.android.tools.r8.shaking.AnnotationMatchResult.isConcreteAnnotationMatchResult():0:0 -> a
@@ -69953,31 +70392,31 @@
 com.android.tools.r8.shaking.DefaultEnqueuerUseRegistry -> com.android.tools.r8.shaking.n:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> d
     com.android.tools.r8.graph.ProgramMethod context -> c
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer):24:26 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedMethod getContextMethod():38:38 -> a
-    2:2:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):53:53 -> a
-    3:3:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):73:73 -> a
-    4:4:void registerCheckCast(com.android.tools.r8.graph.DexType):123:123 -> a
-    5:6:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):143:144 -> a
-    7:8:void registerCallSite(com.android.tools.r8.graph.DexCallSite):149:150 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):63:63 -> b
-    2:2:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):78:78 -> b
-    3:3:void registerConstClass(com.android.tools.r8.graph.DexType):118:118 -> b
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):58:58 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):83:83 -> c
-    3:3:void registerExceptionGuard(com.android.tools.r8.graph.DexType):138:138 -> c
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):43:43 -> d
-    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):68:68 -> d
-    3:3:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):88:88 -> d
-    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):48:48 -> e
-    2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):98:98 -> e
-    3:3:void registerInstanceOf(com.android.tools.r8.graph.DexType):133:133 -> e
-    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):93:93 -> f
-    2:2:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):103:103 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):108:108 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):128:128 -> g
-    1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):113:113 -> h
-com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.U7:
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer):26:28 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedMethod getContextMethod():40:40 -> a
+    2:2:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):55:55 -> a
+    3:3:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):75:75 -> a
+    4:4:void registerConstClass(com.android.tools.r8.graph.DexType,java.util.ListIterator):121:121 -> a
+    5:5:void registerCheckCast(com.android.tools.r8.graph.DexType):126:126 -> a
+    6:7:void registerMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse):146:147 -> a
+    8:9:void registerCallSite(com.android.tools.r8.graph.DexCallSite):152:153 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):65:65 -> b
+    2:2:void registerInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):80:80 -> b
+    3:3:void registerExceptionGuard(com.android.tools.r8.graph.DexType):141:141 -> b
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):45:45 -> c
+    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):60:60 -> c
+    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):85:85 -> c
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):70:70 -> d
+    2:2:void registerInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):90:90 -> d
+    3:3:void registerInstanceOf(com.android.tools.r8.graph.DexType):136:136 -> d
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):50:50 -> e
+    2:2:void registerNewInstance(com.android.tools.r8.graph.DexType):95:95 -> e
+    3:3:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):100:100 -> e
+    1:1:void registerStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField):105:105 -> f
+    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):131:131 -> f
+    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):110:110 -> g
+    1:1:void registerStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField):115:115 -> h
+com.android.tools.r8.shaking.DefaultTreePrunerConfiguration -> com.android.tools.r8.internal.Z7:
     com.android.tools.r8.shaking.DefaultTreePrunerConfiguration INSTANCE -> a
     1:1:void <clinit>():11:11 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -69997,7 +70436,7 @@
     java.util.concurrent.ConcurrentHashMap stringCache -> a
     1:2:void <init>():9:10 -> <init>
     1:1:java.lang.String lookupString(com.android.tools.r8.graph.DexString):13:13 -> a
-com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.P8:
+com.android.tools.r8.shaking.DiscardedChecker -> com.android.tools.r8.internal.Y8:
     java.util.Set checkDiscarded -> a
     java.lang.Iterable classes -> b
     1:3:void <init>(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.lang.Iterable):20:22 -> <init>
@@ -70010,1280 +70449,1310 @@
     12:14:void com.android.tools.r8.shaking.DiscardedChecker.checkItem(com.android.tools.r8.graph.DexDefinition,java.util.List):37:39 -> a
     12:14:void lambda$run$1(java.util.List,com.android.tools.r8.graph.DexEncodedField):31 -> a
 com.android.tools.r8.shaking.Enqueuer -> com.android.tools.r8.shaking.q:
-    java.util.Map reachableVirtualTargets -> R
+    java.util.Map scopedMethodsForLiveTypes -> a0
     com.android.tools.r8.shaking.EnqueuerUseRegistryFactory useRegistryFactory -> o
-    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> H
-    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason initializedTypes -> z
-    java.util.Set liveNonProgramTypes -> A
-    java.util.Map initClassReferences -> V
+    java.util.Map activeIfRules -> Z
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason initializedClasses -> z
     com.android.tools.r8.shaking.AnnotationRemover$Builder annotationRemoverBuilder -> p
     java.util.Map superInvokeDependencies -> w
     java.util.Set exceptionGuardAnalyses -> g
-    com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportRewriter -> b0
-    java.util.Set bootstrapMethods -> J
+    com.android.tools.r8.ir.desugar.BackportedMethodRewriter backportRewriter -> d0
     com.android.tools.r8.shaking.RootSetBuilder$RootSet rootSet -> m
-    java.util.Set classesWithSerializableLambdas -> g0
     com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason liveTypes -> y
-    java.util.Set initialPrunedTypes -> F
+    java.util.Set classesWithSerializableLambdas -> i0
+    java.util.Set initialDeadProtoTypes -> F
     com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl$Builder objectAllocationInfoCollection -> t
-    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> M
-    java.util.Map lambdaCallSites -> e0
+    com.android.tools.r8.shaking.EnqueuerWorklist workList -> R
     com.android.tools.r8.shaking.ProguardClassFilter dontWarnPatterns -> n
-    com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis desugaredLibraryWrapperAnalysis -> c0
-    java.util.Set reportedMissing -> S
-    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> a0
-    java.util.Set deadProtoTypeCandidates -> B
-    java.util.Map deferredAnnotations -> W
+    java.util.Map lambdaCallSites -> g0
+    java.util.Set virtualMethodsTargetedByInvokeDirect -> N
+    java.util.Set lockCandidates -> W
+    com.android.tools.r8.graph.analysis.DesugaredLibraryConversionWrapperAnalysis desugaredLibraryWrapperAnalysis -> e0
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason directlyInitializedInterfaces -> A
+    com.android.tools.r8.ir.desugar.LambdaRewriter lambdaRewriter -> c0
     java.util.Map reachableInstanceFields -> x
-    com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection keepInfo -> T
     com.android.tools.r8.utils.InternalOptions options -> l
+    java.util.Set initialMissingTypes -> G
     java.util.Set checkCastAnalyses -> h
-    java.util.Set missingTypes -> C
+    java.util.Set liveNonProgramTypes -> C
     java.util.Set analyses -> d
     com.android.tools.r8.graph.MethodAccessInfoCollection$SortedBuilder methodAccessInfoCollection -> s
-    com.android.tools.r8.utils.collections.ProgramMethodSet pendingReflectiveUses -> Q
-    java.util.Set instantiatedAppServices -> O
-    com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet liveFields -> N
+    com.android.tools.r8.shaking.GraphReporter graphReporter -> b0
     boolean $assertionsDisabled -> a
-    java.util.Set methodsTargetedByInvokeDynamic -> K
-    java.util.Map unusedInterfaceTypes -> G
+    java.util.Set failedResolutionTargets -> K
+    com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason indirectlyInitializedInterfaces -> B
+    java.util.Map reachableVirtualTargets -> T
+    com.android.tools.r8.shaking.Enqueuer$SetWithReason targetedMethods -> J
     java.util.Map callSites -> u
-    java.util.Map activeIfRules -> X
+    java.util.Map initClassReferences -> X
+    java.util.Set initialPrunedTypes -> H
     com.android.tools.r8.shaking.Enqueuer$Mode mode -> c
-    java.util.Set initialDeadProtoTypes -> D
+    java.util.Set deadProtoTypeCandidates -> D
     java.util.Set invokeAnalyses -> e
-    java.util.Map syntheticInterfaceMethodBridges -> h0
-    com.android.tools.r8.shaking.EnqueuerWorklist workList -> P
+    java.util.Map methodsWithBackports -> h0
+    java.util.Map syntheticInterfaceMethodBridges -> j0
     boolean forceProguardCompatibility -> b
-    java.util.Set virtualMethodsTargetedByInvokeDirect -> L
-    java.util.Map lambdaClasses -> d0
-    java.util.Map methodsWithBackports -> f0
-    java.util.Set constClassReferences -> U
+    java.util.Set bootstrapMethods -> L
+    com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet liveMethods -> O
+    java.util.Map lambdaClasses -> f0
+    java.util.Set reportedMissing -> U
     java.util.Set identifierNameStrings -> v
-    java.util.Map scopedMethodsForLiveTypes -> Y
+    java.util.Map deferredAnnotations -> Y
+    com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection keepInfo -> V
     com.android.tools.r8.graph.AppView appView -> j
     com.android.tools.r8.graph.FieldAccessInfoCollectionImpl fieldAccessInfoCollection -> r
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> i
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> k
-    java.util.Set failedResolutionTargets -> I
-    com.android.tools.r8.shaking.GraphReporter graphReporter -> Z
-    java.util.Set initialMissingTypes -> E
+    com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet liveFields -> P
+    com.android.tools.r8.utils.collections.ProgramMethodSet pendingReflectiveUses -> S
+    java.util.Set missingTypes -> E
     java.util.Set instanceOfAnalyses -> f
+    java.util.Map unusedInterfaceTypes -> I
     com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier enqueuerDefinitionSupplier -> q
-    1:1:void <clinit>():156:156 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):361:361 -> <init>
-    2:3291:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):188:3477 -> <init>
-    3292:3337:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):362:407 -> <init>
-    1:527:void recordFieldReference(com.android.tools.r8.graph.DexField):0:526 -> a
-    1:527:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):156 -> a
-    528:528:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    528:528:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3455 -> a
-    529:529:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3457:3457 -> a
-    530:530:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2494:2494 -> a
-    530:530:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3458 -> a
-    531:534:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3460:3463 -> a
-    535:535:java.util.Set access$1000(com.android.tools.r8.shaking.Enqueuer):156:156 -> a
-    536:536:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):156:156 -> a
-    537:537:com.android.tools.r8.graph.DexProgramClass access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):156:156 -> a
-    538:538:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):156:156 -> a
-    539:539:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):156:156 -> a
-    540:540:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod):156:156 -> a
-    541:541:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):156:156 -> a
-    542:542:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):156:156 -> a
-    543:543:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():298:298 -> a
-    543:543:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1024 -> a
-    544:546:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1024:1026 -> a
-    547:547:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
-    547:547:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1028 -> a
-    548:548:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    548:548:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1029 -> a
-    549:553:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1030:1034 -> a
-    554:554:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):379:379 -> a
-    555:555:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):435:435 -> a
-    555:555:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):379 -> a
-    556:556:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):425:425 -> a
-    557:557:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):440:440 -> a
-    558:558:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):445:445 -> a
-    559:559:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):450:450 -> a
-    560:560:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):455:455 -> a
-    561:561:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):460:460 -> a
-    562:563:void setInitialDeadProtoTypes(java.util.Set):464:465 -> a
-    564:564:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):479:479 -> a
-    565:565:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
-    565:565:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):479 -> a
-    566:566:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    566:566:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):347 -> a
-    566:566:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):479 -> a
-    567:567:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):348:348 -> a
-    567:567:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):479 -> a
-    568:569:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):479:480 -> a
-    570:570:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    570:570:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):480 -> a
-    571:571:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):480:480 -> a
-    572:572:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):484:484 -> a
-    572:572:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):480 -> a
-    573:576:void recordMethodReference(com.android.tools.r8.graph.DexMethod):517:520 -> a
-    577:583:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):590:596 -> a
-    584:584:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    584:584:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):596 -> a
-    585:591:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):598:604 -> a
-    592:592:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):632:632 -> a
-    593:593:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1612:1612 -> a
-    593:593:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):632 -> a
-    594:594:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):633:633 -> a
-    595:595:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1635:1635 -> a
-    595:595:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):633 -> a
-    596:596:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):634:634 -> a
-    597:597:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.BiConsumer):1602:1602 -> a
-    597:597:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):634 -> a
-    598:598:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):653:653 -> a
-    599:599:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    599:599:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):653 -> a
-    600:600:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):653:653 -> a
-    601:602:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):661:662 -> a
-    601:602:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):655 -> a
-    603:603:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):667:667 -> a
-    604:604:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    604:604:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):668 -> a
-    605:615:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):669:679 -> a
-    616:620:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):677:681 -> a
-    621:621:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):654:654 -> a
-    621:621:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):681 -> a
-    622:622:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):277:277 -> a
-    622:622:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):654 -> a
-    622:622:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):681 -> a
-    623:623:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):682:682 -> a
-    624:624:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):690:690 -> a
-    625:625:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218:218 -> a
-    625:625:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):692 -> a
-    626:626:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):227:227 -> a
-    626:626:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218 -> a
-    626:626:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):692 -> a
-    627:629:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):701:703 -> a
-    627:629:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):694 -> a
-    630:630:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):702:702 -> a
-    630:630:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):694 -> a
-    631:633:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):708:710 -> a
-    634:636:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):719:721 -> a
-    634:636:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):712 -> a
-    637:637:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):720:720 -> a
-    637:637:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):712 -> a
-    638:639:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):730:731 -> a
-    640:641:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):661:662 -> a
-    640:641:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):733 -> a
-    642:642:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    642:642:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):735 -> a
-    643:646:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):736:739 -> a
-    647:649:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):701:703 -> a
-    647:649:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):739 -> a
-    650:650:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):702:702 -> a
-    650:650:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):739 -> a
-    651:655:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):741:745 -> a
-    656:658:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):719:721 -> a
-    656:658:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):745 -> a
-    659:659:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):720:720 -> a
-    659:659:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):745 -> a
-    660:660:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):748:748 -> a
-    661:662:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):771:772 -> a
-    663:667:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):780:784 -> a
-    668:671:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):794:797 -> a
-    672:672:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):803:803 -> a
-    672:672:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1279 -> a
-    673:692:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1284:1303 -> a
-    693:693:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    693:693:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1303 -> a
-    694:698:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1308:1312 -> a
-    699:705:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1310:1316 -> a
-    706:706:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
-    706:706:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1316 -> a
-    707:707:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1316:1316 -> a
-    708:739:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):826:857 -> a
-    740:762:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):861:883 -> a
-    763:763:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2077:2077 -> a
-    763:763:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):887 -> a
-    764:779:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2084:2099 -> a
-    764:779:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2078 -> a
-    764:779:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):887 -> a
-    780:780:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2079:2079 -> a
-    780:780:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):887 -> a
-    781:781:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):16:16 -> a
-    781:781:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2105 -> a
-    781:781:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):888 -> a
-    782:783:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2105:2106 -> a
-    782:783:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):888 -> a
-    784:784:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2104:2104 -> a
-    784:784:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):888 -> a
-    785:816:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):889:920 -> a
-    817:817:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    817:817:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1109 -> a
-    817:817:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):908 -> a
-    818:818:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1109:1109 -> a
-    818:818:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):908 -> a
-    819:819:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    819:819:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1084 -> a
-    819:819:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):914 -> a
-    820:820:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1084:1084 -> a
-    820:820:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):914 -> a
-    821:821:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917:917 -> a
-    822:822:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1250:1250 -> a
-    822:822:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
-    823:823:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    823:823:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1251 -> a
-    823:823:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
-    824:824:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1250:1250 -> a
-    824:824:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
-    825:825:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    825:825:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1204 -> a
-    825:825:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):911 -> a
-    826:826:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1204:1204 -> a
-    826:826:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):911 -> a
-    827:827:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
-    827:827:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1134 -> a
-    827:827:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):905 -> a
-    828:828:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1134:1134 -> a
-    828:828:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):905 -> a
-    829:829:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$4(com.android.tools.r8.graph.DexCallSite):889:889 -> a
-    830:830:void lambda$traceCheckCast$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):925:925 -> a
-    831:837:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1007:1013 -> a
-    838:838:void lambda$traceInstanceOf$6(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1046:1046 -> a
-    839:839:void lambda$traceExceptionGuard$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1051:1051 -> a
-    840:840:void lambda$traceInvokeDirect$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1060:1060 -> a
-    841:847:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1072:1078 -> a
-    848:848:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1074:1074 -> a
-    849:849:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$10(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1076:1076 -> a
-    850:850:boolean lambda$registerDeferredActionForDeadProtoBuilder$9(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1077:1077 -> a
-    851:860:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1089:1098 -> a
-    861:861:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    861:861:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1098 -> a
-    862:863:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1100:1101 -> a
-    864:864:void lambda$traceInvokeDirect$11(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1101:1101 -> a
-    865:865:void lambda$traceNewInstance$16(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1236:1236 -> a
-    866:866:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1259:1259 -> a
-    867:867:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    867:867:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1261 -> a
-    868:871:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1261:1264 -> a
-    872:872:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1262:1262 -> a
-    873:873:java.lang.Boolean lambda$traceStaticFieldRead$17(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1411:1411 -> a
-    874:874:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.ProgramMethod):1488:1488 -> a
-    875:875:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$19(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1488:1488 -> a
-    876:891:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1541:1556 -> a
-    892:892:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1553:1553 -> a
-    893:913:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1568:1588 -> a
-    914:914:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    914:914:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1588 -> a
-    915:950:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1591:1626 -> a
-    951:962:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):754:765 -> a
-    951:962:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1627 -> a
-    963:963:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1630:1630 -> a
-    964:964:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    964:964:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1633 -> a
-    965:976:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1634:1645 -> a
-    977:977:java.util.Set com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1460:1460 -> a
-    977:977:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1645 -> a
-    978:981:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1644:1647 -> a
-    982:982:boolean lambda$markTypeAsLive$24(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1636:1636 -> a
-    983:983:void lambda$markTypeAsLive$26(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1647:1647 -> a
-    984:987:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1651:1654 -> a
-    988:988:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1659:1659 -> a
-    989:991:boolean lambda$ensureMethodsContinueToWidenAccess$28(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1661:1663 -> a
-    992:997:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):344:349 -> a
-    992:997:boolean lambda$ensureMethodsContinueToWidenAccess$28(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1663 -> a
-    998:998:void lambda$ensureMethodsContinueToWidenAccess$29(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1664:1664 -> a
-    999:999:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexEncodedMember,java.util.Set):1712:1712 -> a
-    1000:1001:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1717:1718 -> a
-    1002:1002:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1722:1722 -> a
-    1003:1003:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotationSet):1727:1727 -> a
-    1003:1003:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1722 -> a
-    1004:1005:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1732:1733 -> a
-    1004:1005:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotationSet):1727 -> a
-    1004:1005:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1722 -> a
-    1006:1008:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1739:1739 -> a
-    1010:1013:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1741:1744 -> a
-    1014:1014:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    1014:1014:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1744 -> a
-    1015:1020:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1745:1750 -> a
-    1021:1021:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):25:25 -> a
-    1021:1021:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1754 -> a
-    1022:1025:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1755:1758 -> a
-    1026:1029:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1763:1766 -> a
-    1030:1030:void reportMissingField(com.android.tools.r8.graph.DexField):1980:1980 -> a
-    1030:1030:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1767 -> a
-    1031:1031:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1031:1031:void reportMissingField(com.android.tools.r8.graph.DexField):1981 -> a
-    1031:1031:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1767 -> a
-    1032:1062:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1855:1885 -> a
-    1063:1064:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):771:772 -> a
-    1063:1064:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1886 -> a
-    1065:1105:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):1891:1931 -> a
-    1106:1108:void lambda$ensureFromLibraryOrThrow$32(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,java.lang.Boolean):1909:1911 -> a
-    1109:1111:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1943:1945 -> a
-    1112:1112:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
-    1112:1112:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1946 -> a
-    1113:1120:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1946:1953 -> a
-    1121:1123:void lambda$keepClassAndAllMembers$33(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):1949:1951 -> a
-    1124:1126:void lambda$keepClassAndAllMembers$34(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):1955:1957 -> a
-    1127:1127:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2019:2019 -> a
-    1128:1128:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    1128:1128:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2019 -> a
-    1129:1135:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2019:2025 -> a
-    1136:1137:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2054:2055 -> a
-    1136:1137:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2028 -> a
-    1138:1139:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2032:2033 -> a
-    1140:1140:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    1140:1140:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2033 -> a
-    1141:1143:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2036:2038 -> a
-    1144:1144:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    1144:1144:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2111 -> a
-    1144:1144:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2041 -> a
-    1145:1146:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2111:2112 -> a
-    1145:1146:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2041 -> a
-    1147:1147:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):12:12 -> a
-    1147:1147:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2114 -> a
-    1147:1147:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2041 -> a
-    1148:1148:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2114:2114 -> a
-    1148:1148:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2041 -> a
-    1149:1149:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2113:2113 -> a
-    1149:1149:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2041 -> a
-    1150:1150:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2043:2043 -> a
-    1151:1151:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    1151:1151:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2319 -> a
-    1151:1151:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2045 -> a
-    1152:1154:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2319:2321 -> a
-    1152:1154:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2045 -> a
-    1155:1155:void lambda$processNewlyInstantiatedClass$36(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2026:2026 -> a
-    1156:1156:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2060:2060 -> a
-    1157:1157:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
-    1157:1157:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2060 -> a
-    1158:1159:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2060:2061 -> a
-    1160:1161:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2325:2326 -> a
-    1160:1161:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2062 -> a
-    1162:1193:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2126:2157 -> a
-    1194:1194:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2162:2162 -> a
-    1194:1194:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2170 -> a
-    1195:1212:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2170:2187 -> a
-    1213:1213:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2186:2186 -> a
-    1214:1218:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2201:2205 -> a
-    1219:1219:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2204:2204 -> a
-    1220:1231:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2202:2213 -> a
-    1232:1234:com.android.tools.r8.graph.LookupTarget com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult.lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):558:560 -> a
-    1232:1234:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2213 -> a
-    1235:1235:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2215:2215 -> a
-    1236:1238:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLiveOverrides$37(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):2218:2218 -> a
-    1239:1251:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2225:2237 -> a
-    1252:1252:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2236:2236 -> a
-    1253:1253:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    1253:1253:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2244 -> a
-    1254:1258:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2244:2248 -> a
-    1259:1265:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2247:2253 -> a
-    1266:1266:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2250:2250 -> a
-    1267:1267:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2262:2262 -> a
-    1268:1310:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3561:3603 -> a
-    1268:1310:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2266 -> a
-    1311:1311:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2269:2269 -> a
-    1312:1312:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    1312:1312:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2274 -> a
-    1313:1313:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2277:2277 -> a
-    1314:1314:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2276:2276 -> a
-    1315:1315:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$38(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2272:2272 -> a
-    1316:1331:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2283:2298 -> a
-    1332:1336:void com.android.tools.r8.graph.DexClass.forEachImmediateSupertype(java.util.function.Consumer):700:704 -> a
-    1332:1336:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2298 -> a
-    1337:1337:void lambda$transitionFieldsForInstantiatedClass$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramField):2312:2312 -> a
-    1338:1339:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2356:2357 -> a
-    1340:1340:void lambda$markInstanceFieldAsLive$44(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2408:2408 -> a
-    1341:1341:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2443:2443 -> a
-    1342:1342:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2447:2447 -> a
-    1343:1344:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2457:2458 -> a
-    1345:1345:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2473:2473 -> a
-    1346:1346:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    1346:1346:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2474 -> a
-    1347:1348:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2475:2476 -> a
-    1349:1349:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2480:2480 -> a
-    1350:1350:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2494:2494 -> a
-    1350:1350:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3400 -> a
-    1351:1355:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3401:3405 -> a
-    1356:1448:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> a
-    1356:1448:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3405 -> a
-    1449:1452:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3407:3410 -> a
-    1453:1453:java.util.Set com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1460:1460 -> a
-    1453:1453:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3411 -> a
-    1454:1454:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3410:3410 -> a
-    1455:1455:void forAllLiveClasses(java.util.function.Consumer):2503:2503 -> a
-    1456:1456:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$45(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexProgramClass):2515:2515 -> a
-    1457:1473:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2536:2552 -> a
-    1474:1475:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1786:1787 -> a
-    1474:1475:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2556 -> a
-    1476:1985:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):0:509 -> a
-    1476:1985:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1787 -> a
-    1476:1985:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2556 -> a
-    1986:1990:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1788:1792 -> a
-    1986:1990:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2556 -> a
-    1991:1991:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2561:2561 -> a
-    1992:1992:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2162:2162 -> a
-    1992:1992:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2570 -> a
-    1993:1999:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2570:2576 -> a
-    2000:2000:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    2000:2000:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2576 -> a
-    2001:2030:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2581:2610 -> a
-    2031:2031:void lambda$markVirtualMethodAsReachable$48(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2607:2607 -> a
-    2032:2032:boolean lambda$markVirtualMethodAsReachable$49(com.android.tools.r8.graph.DexDefinition):2609:2609 -> a
-    2033:2033:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> a
-    2033:2033:boolean lambda$markVirtualMethodAsReachable$49(com.android.tools.r8.graph.DexDefinition):2609 -> a
-    2034:2034:void lambda$markVirtualMethodAsReachable$51(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2612:2612 -> a
-    2035:2035:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$50(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2615:2615 -> a
-    2036:2037:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2621:2622 -> a
-    2038:2040:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2631:2633 -> a
-    2038:2040:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2622 -> a
-    2041:2042:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2624:2625 -> a
-    2043:2045:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2639:2641 -> a
-    2043:2045:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2625 -> a
-    2046:2047:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2647:2648 -> a
-    2048:2051:void lambda$markFailedResolutionTargets$52(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2650:2653 -> a
-    2052:2052:void lambda$markEnumValuesAsReachable$53(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2676:2676 -> a
-    2053:2060:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2727:2734 -> a
-    2061:2066:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2743:2748 -> a
-    2067:2067:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):435:435 -> a
-    2067:2067:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2748 -> a
-    2068:2070:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2752:2754 -> a
-    2071:2071:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):435:435 -> a
-    2071:2071:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2754 -> a
-    2072:2076:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2756:2760 -> a
-    2077:2077:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
-    2077:2077:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2760 -> a
-    2078:2101:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2760:2783 -> a
-    2102:2102:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):725:725 -> a
-    2102:2102:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2784 -> a
-    2103:2103:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2786:2786 -> a
-    2104:2104:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):725:725 -> a
-    2104:2104:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2787 -> a
-    2105:2105:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):725:725 -> a
-    2105:2105:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2789 -> a
-    2106:2123:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2776:2793 -> a
-    2124:2127:void finalizeLibraryMethodOverrideInformation():3023:3026 -> a
-    2124:2127:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2794 -> a
-    2128:2129:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2795:2796 -> a
-    2130:2132:boolean verifyKeptGraph():3033:3035 -> a
-    2130:2132:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2796 -> a
-    2133:2133:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2797:2797 -> a
-    2134:2315:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():0:181 -> a
-    2134:2315:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2797 -> a
-    2316:2318:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2802:2804 -> a
-    2319:2320:void lambda$traceApplication$55(com.android.tools.r8.graph.DexReference,java.util.List):2770:2771 -> a
-    2321:2321:void lambda$traceApplication$56(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2795:2795 -> a
-    2322:2322:com.android.tools.r8.graph.GraphLens$NestedGraphLens buildGraphLens():2810:2810 -> a
-    2323:2323:void lambda$keepClassWithRules$57(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.shaking.KeepClassInfo$Joiner):2814:2814 -> a
-    2324:2324:void lambda$keepMethodWithRules$58(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2818:2818 -> a
-    2325:2325:void keepFieldWithRules(com.android.tools.r8.graph.ProgramField,java.util.Set):2822:2822 -> a
-    2326:2326:void lambda$keepFieldWithRules$59(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2822:2822 -> a
-    2327:2327:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2829:2829 -> a
-    2328:2328:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    2328:2328:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2831 -> a
-    2329:2329:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2831:2831 -> a
-    2330:2330:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardIfRule.getSubsequentRule():42:42 -> a
-    2330:2330:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2831 -> a
-    2331:2335:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2832:2836 -> a
-    2336:2336:boolean com.android.tools.r8.graph.AccessFlags.isPackagePrivateOrProtected():132:132 -> a
-    2336:2336:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2836 -> a
-    2337:2344:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2837:2844 -> a
-    2345:2345:com.android.tools.r8.graph.DexApplication lambda$synthesize$60(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):2959:2959 -> a
-    2346:2351:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):2901:2906 -> a
-    2346:2351:com.android.tools.r8.graph.DexApplication lambda$synthesize$60(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):2960 -> a
-    2352:2352:com.android.tools.r8.graph.DexApplication lambda$synthesize$60(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):2961:2961 -> a
-    2353:2354:void synthesizeBackports(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2983:2984 -> a
-    2355:2383:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3046:3074 -> a
-    2384:2384:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    2384:2384:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3075 -> a
-    2385:2385:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3076:3076 -> a
-    2386:2386:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
-    2386:2386:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3077 -> a
-    2387:2425:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3078:3116 -> a
-    2426:2431:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3291:3296 -> a
-    2426:2431:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3136 -> a
-    2432:2437:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3137:3142 -> a
-    2438:2438:void lambda$createAppInfo$61(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3052:3052 -> a
-    2439:2439:boolean lambda$createAppInfo$62(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3058:3058 -> a
-    2440:2452:void lambda$ensureLambdaAccessibility$63(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3154:3166 -> a
-    2453:2525:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():0:72 -> a
-    2453:2525:void lambda$ensureLambdaAccessibility$63(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3166 -> a
-    2526:2526:void lambda$ensureLambdaAccessibility$63(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3166:3166 -> a
-    2527:2533:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3198:3204 -> a
-    2534:2545:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3232:3243 -> a
-    2534:2545:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3204 -> a
-    2546:2546:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2484:2484 -> a
-    2546:2546:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3243 -> a
-    2546:2546:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3204 -> a
-    2547:2547:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3244:3244 -> a
-    2547:2547:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3204 -> a
-    2548:2550:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3252:3254 -> a
-    2548:2550:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3244 -> a
-    2548:2550:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3204 -> a
-    2551:2565:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3211:3225 -> a
-    2566:2568:void rewriteLambdaCallSites(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):3274:3276 -> a
-    2569:2652:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3302:3385 -> a
-    2653:2653:java.util.Set lambda$trace$65(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3321:3321 -> a
-    2654:2654:void lambda$trace$66(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3353:3353 -> a
-    2655:2655:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3397:3397 -> a
-    2656:2656:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1360:1360 -> a
-    2656:2656:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2094 -> a
-    2656:2656:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3397 -> a
-    2657:2657:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    2657:2657:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1361 -> a
-    2657:2657:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2094 -> a
-    2657:2657:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3397 -> a
-    2658:2658:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1362:1362 -> a
-    2658:2658:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2094 -> a
-    2658:2658:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3397 -> a
-    2659:2659:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    2659:2659:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1363 -> a
-    2659:2659:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2094 -> a
-    2659:2659:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3397 -> a
-    2660:2662:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1363:1365 -> a
-    2660:2662:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2094 -> a
-    2660:2662:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3397 -> a
-    2663:2688:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3414:3439 -> a
-    2689:2689:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1597:1597 -> a
-    2689:2689:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1591 -> a
-    2689:2689:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3439 -> a
-    2690:2690:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1607:1607 -> a
-    2690:2690:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1617 -> a
-    2690:2690:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1592 -> a
-    2690:2690:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3439 -> a
-    2691:2691:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1630:1630 -> a
-    2691:2691:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1618 -> a
-    2691:2691:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1592 -> a
-    2691:2691:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3439 -> a
-    2692:2695:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3442:3445 -> a
-    2696:2697:void lambda$addConsequentRootSet$68(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):3417:3418 -> a
-    2698:2699:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3423:3424 -> a
-    2700:2700:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1597:1597 -> a
-    2700:2700:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1591 -> a
-    2700:2700:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3424 -> a
-    2701:2701:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1607:1607 -> a
-    2701:2701:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1617 -> a
-    2701:2701:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1592 -> a
-    2701:2701:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3424 -> a
-    2702:2702:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1630:1630 -> a
-    2702:2702:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1618 -> a
-    2702:2702:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1592 -> a
-    2702:2702:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3424 -> a
-    2703:2705:void retainAnnotationForFinalTreeShaking(java.util.List):3510:3512 -> a
-    2706:2706:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3553:3553 -> a
-    2707:2707:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    2707:2707:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3553 -> a
-    2708:2710:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3554:3556 -> a
-    2711:2719:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):3612:3620 -> a
-    2720:2720:void lambda$markMethodAsLive$73(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):3650:3650 -> a
-    2721:2721:void lambda$markMethodAsLive$74(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3659:3659 -> a
-    2722:2732:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3663:3673 -> a
-    2733:2735:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3672:3674 -> a
-    2736:2736:boolean lambda$checkMemberForSoftPinning$75(com.android.tools.r8.shaking.ProguardKeepRuleBase):3666:3666 -> a
-    2737:2743:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3966:3972 -> a
-    2744:2744:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
-    2744:2744:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3972 -> a
-    2745:2761:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3977:3993 -> a
-    2762:2762:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
-    2762:2762:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3994 -> a
-    2763:2767:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3995:3999 -> a
-    2768:2768:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):185:185 -> a
-    2768:2768:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3999 -> a
-    2769:2781:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):4056:4068 -> a
+    java.util.Set instantiatedAppServices -> Q
+    java.util.Set methodsTargetedByInvokeDynamic -> M
+    1:1:void <clinit>():160:160 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):380:380 -> <init>
+    2:3426:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):192:3616 -> <init>
+    3427:3469:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,com.android.tools.r8.shaking.Enqueuer$Mode):381:423 -> <init>
+    1:543:void recordFieldReference(com.android.tools.r8.graph.DexField):0:542 -> a
+    1:543:void access$1600(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexField):160 -> a
+    544:544:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    544:544:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3594 -> a
+    545:545:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3596:3596 -> a
+    546:546:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> a
+    546:546:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3596 -> a
+    547:547:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3596:3596 -> a
+    548:548:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2634:2634 -> a
+    548:548:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3597 -> a
+    549:550:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3599:3600 -> a
+    551:551:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> a
+    551:551:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3600 -> a
+    552:554:boolean isLiveProgramReference(com.android.tools.r8.graph.DexReference):3600:3602 -> a
+    555:555:java.util.Set access$1000(com.android.tools.r8.shaking.Enqueuer):160:160 -> a
+    556:556:void access$1500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass):160:160 -> a
+    557:557:com.android.tools.r8.graph.DexProgramClass access$1700(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):160:160 -> a
+    558:558:void access$1900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    559:559:void access$2100(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    560:560:void access$2200(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexMethod):160:160 -> a
+    561:561:void access$2300(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    562:562:void access$2400(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):160:160 -> a
+    563:563:boolean com.android.tools.r8.graph.DexMethodHandle.isMethodHandle():298:298 -> a
+    563:563:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1099 -> a
+    564:566:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1099:1101 -> a
+    567:567:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.methodHandleReferencedIn(com.android.tools.r8.graph.ProgramMethod):85:85 -> a
+    567:567:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1103 -> a
+    568:568:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    568:568:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1104 -> a
+    569:573:void traceMethodHandle(com.android.tools.r8.graph.DexMethodHandle,com.android.tools.r8.graph.UseRegistry$MethodHandleUse,com.android.tools.r8.graph.ProgramMethod):1105:1109 -> a
+    574:574:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):398:398 -> a
+    575:575:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):451:451 -> a
+    575:575:void lambda$new$0(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):398 -> a
+    576:576:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory lambda$createUseRegistryFactory$1(com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteShrinker):441:441 -> a
+    577:577:com.android.tools.r8.shaking.Enqueuer registerInvokeAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):456:456 -> a
+    578:578:com.android.tools.r8.shaking.Enqueuer registerInstanceOfAnalysis(com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):461:461 -> a
+    579:579:com.android.tools.r8.shaking.Enqueuer registerCheckCastAnalysis(com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):466:466 -> a
+    580:580:com.android.tools.r8.shaking.Enqueuer registerExceptionGuardAnalysis(com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):471:471 -> a
+    581:581:void setAnnotationRemoverBuilder(com.android.tools.r8.shaking.AnnotationRemover$Builder):476:476 -> a
+    582:583:void setInitialDeadProtoTypes(java.util.Set):480:481 -> a
+    584:584:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):495:495 -> a
+    585:585:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> a
+    585:585:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):495 -> a
+    586:586:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    586:586:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):352 -> a
+    586:586:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):495 -> a
+    587:587:boolean com.android.tools.r8.graph.DexType.isProgramType(com.android.tools.r8.graph.DexDefinitionSupplier):353:353 -> a
+    587:587:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):495 -> a
+    588:589:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):495:496 -> a
+    590:590:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    590:590:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):496 -> a
+    591:591:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):496:496 -> a
+    592:592:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):500:500 -> a
+    592:592:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexType):496 -> a
+    593:596:void recordMethodReference(com.android.tools.r8.graph.DexMethod):533:536 -> a
+    597:605:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,boolean):564:572 -> a
+    606:614:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):583:591 -> a
+    606:614:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,boolean):573 -> a
+    615:615:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):597:597 -> a
+    615:615:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):592 -> a
+    615:615:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,boolean):573 -> a
+    616:616:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    616:616:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):598 -> a
+    616:616:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):592 -> a
+    616:616:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,boolean):573 -> a
+    617:619:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):600:602 -> a
+    617:619:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):592 -> a
+    617:619:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,boolean):573 -> a
+    620:624:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):648:652 -> a
+    620:624:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):602 -> a
+    620:624:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):592 -> a
+    620:624:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,boolean):573 -> a
+    625:635:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):604:614 -> a
+    625:635:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):592 -> a
+    625:635:com.android.tools.r8.graph.DexClass internalDefinitionFor(com.android.tools.r8.graph.DexType,boolean):573 -> a
+    636:642:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):619:625 -> a
+    643:643:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    643:643:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):625 -> a
+    644:650:void addNonProgramClassToWorklist(com.android.tools.r8.graph.DexType,java.util.Deque):627:633 -> a
+    651:651:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):661:661 -> a
+    652:652:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1618:1618 -> a
+    652:652:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):661 -> a
+    653:653:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):662:662 -> a
+    654:654:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1641:1641 -> a
+    654:654:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):662 -> a
+    655:655:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):663:663 -> a
+    656:656:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.BiConsumer):1608:1608 -> a
+    656:656:void enqueueRootItems(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):663 -> a
+    657:657:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):682:682 -> a
+    658:658:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    658:658:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):682 -> a
+    659:659:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):682:682 -> a
+    660:661:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):690:691 -> a
+    660:661:void enqueueRootClass(com.android.tools.r8.graph.DexType,java.util.Set):684 -> a
+    662:662:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):696:696 -> a
+    663:663:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    663:663:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):697 -> a
+    664:674:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):698:708 -> a
+    675:679:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):706:710 -> a
+    680:680:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):672:672 -> a
+    680:680:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):710 -> a
+    681:681:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isExternalizable(com.android.tools.r8.graph.DexType):277:277 -> a
+    681:681:boolean com.android.tools.r8.graph.DexClass.isExternalizable(com.android.tools.r8.graph.AppView):672 -> a
+    681:681:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):710 -> a
+    682:682:void enqueueKeepRuleInstantiatedType(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):711:711 -> a
+    683:683:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):719:719 -> a
+    684:684:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218:218 -> a
+    684:684:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):721 -> a
+    685:685:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):227:227 -> a
+    685:685:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218 -> a
+    685:685:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):721 -> a
+    686:688:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):730:732 -> a
+    686:688:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):723 -> a
+    689:689:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):731:731 -> a
+    689:689:void enqueueRootField(com.android.tools.r8.graph.DexField,java.util.Set):723 -> a
+    690:692:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):737:739 -> a
+    693:695:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):748:750 -> a
+    693:695:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):741 -> a
+    696:696:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):749:749 -> a
+    696:696:void enqueueRootMethod(com.android.tools.r8.graph.DexMethod,java.util.Set):741 -> a
+    697:698:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):759:760 -> a
+    699:700:void enqueueRootClass(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.graph.DexDefinition):690:691 -> a
+    699:700:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):762 -> a
+    701:701:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    701:701:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):764 -> a
+    702:705:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):765:768 -> a
+    706:708:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):730:732 -> a
+    706:708:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):768 -> a
+    709:709:void enqueueRootField(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.graph.DexDefinition):731:731 -> a
+    709:709:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):768 -> a
+    710:714:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):770:774 -> a
+    715:717:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):748:750 -> a
+    715:717:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):774 -> a
+    718:718:void enqueueRootMethod(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.graph.DexDefinition):749:749 -> a
+    718:718:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):774 -> a
+    719:719:void internalEnqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set,com.android.tools.r8.graph.DexDefinition):777:777 -> a
+    720:721:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):800:801 -> a
+    722:726:void compatEnqueueHolderIfDependentNonStaticMember(com.android.tools.r8.graph.DexProgramClass,java.util.Set):809:813 -> a
+    727:730:boolean registerMethodWithTargetAndContext(java.util.function.BiPredicate,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):823:826 -> a
+    731:731:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):832:832 -> a
+    731:731:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1354 -> a
+    732:751:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1359:1378 -> a
+    752:752:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    752:752:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1378 -> a
+    753:757:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1383:1387 -> a
+    758:764:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1385:1391 -> a
+    765:765:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> a
+    765:765:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1391 -> a
+    766:766:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1391:1391 -> a
+    767:798:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):855:886 -> a
+    799:821:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):890:912 -> a
+    822:822:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2217:2217 -> a
+    822:822:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):916 -> a
+    823:823:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> a
+    823:823:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2224 -> a
+    823:823:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2218 -> a
+    823:823:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):916 -> a
+    824:837:void checkLambdaInterface(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):2226:2239 -> a
+    824:837:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2218 -> a
+    824:837:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):916 -> a
+    838:838:void markLambdaAsInstantiated(com.android.tools.r8.ir.desugar.LambdaDescriptor,com.android.tools.r8.graph.ProgramMethod):2219:2219 -> a
+    838:838:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):916 -> a
+    839:839:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.ir.desugar.LambdaDescriptor):16:16 -> a
+    839:839:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2245 -> a
+    839:839:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
+    840:841:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2245:2246 -> a
+    840:841:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
+    842:842:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> a
+    842:842:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2246 -> a
+    842:842:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
+    843:843:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2246:2246 -> a
+    843:843:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
+    844:844:void transitionMethodsForInstantiatedLambda(com.android.tools.r8.ir.desugar.LambdaDescriptor):2244:2244 -> a
+    844:844:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):917 -> a
+    845:876:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):918:949 -> a
+    877:877:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    877:877:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1184 -> a
+    877:877:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):937 -> a
+    878:878:void traceInvokeInterfaceFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1184:1184 -> a
+    878:878:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):937 -> a
+    879:879:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    879:879:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1159 -> a
+    879:879:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):943 -> a
+    880:880:void traceInvokeDirectFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1159:1159 -> a
+    880:880:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):943 -> a
+    881:881:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):946:946 -> a
+    882:882:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1325:1325 -> a
+    882:882:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):946 -> a
+    883:883:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    883:883:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1326 -> a
+    883:883:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):946 -> a
+    884:884:void traceNewInstanceFromLambda(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1325:1325 -> a
+    884:884:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):946 -> a
+    885:885:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    885:885:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279 -> a
+    885:885:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):940 -> a
+    886:886:void traceInvokeVirtualFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1279:1279 -> a
+    886:886:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):940 -> a
+    887:887:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFromLambdaCreatedIn(com.android.tools.r8.graph.ProgramMethod):57:57 -> a
+    887:887:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1209 -> a
+    887:887:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):934 -> a
+    888:888:void traceInvokeStaticFromLambda(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1209:1209 -> a
+    888:888:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):934 -> a
+    889:889:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$traceCallSite$4(com.android.tools.r8.graph.DexCallSite):918:918 -> a
+    890:890:void lambda$traceCheckCast$5(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerCheckCastAnalysis):954:954 -> a
+    891:895:void handleLockCandidate(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):972:976 -> a
+    891:895:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):962 -> a
+    896:896:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):963:963 -> a
+    897:898:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):992:993 -> a
+    899:955:java.lang.Object com.android.tools.r8.utils.IteratorUtils.nextUntil(java.util.Iterator,java.util.function.Predicate):0:56 -> a
+    899:955:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):994 -> a
+    956:962:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):994:1000 -> a
+    963:963:boolean com.android.tools.r8.cf.code.CfInstruction.isInvoke():0:0 -> a
+    963:963:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1001 -> a
+    964:966:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1002:1004 -> a
+    967:967:boolean com.android.tools.r8.graph.DexItemFactory$ClassMethods.isReflectiveNameLookup(com.android.tools.r8.graph.DexMethod):1237:1237 -> a
+    967:967:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1005 -> a
+    968:975:boolean isConstClassMaybeUsedAsLock(com.android.tools.r8.graph.ProgramMethod,java.util.ListIterator):1005:1012 -> a
+    976:976:boolean lambda$isConstClassMaybeUsedAsLock$6(com.android.tools.r8.code.CfOrDexInstruction):997:997 -> a
+    977:977:boolean com.android.tools.r8.cf.code.CfInstruction.isLabel():0:0 -> a
+    977:977:boolean lambda$isConstClassMaybeUsedAsLock$6(com.android.tools.r8.code.CfOrDexInstruction):997 -> a
+    978:978:boolean lambda$isConstClassMaybeUsedAsLock$6(com.android.tools.r8.code.CfOrDexInstruction):998:998 -> a
+    979:979:boolean com.android.tools.r8.cf.code.CfInstruction.isPosition():0:0 -> a
+    979:979:boolean lambda$isConstClassMaybeUsedAsLock$6(com.android.tools.r8.code.CfOrDexInstruction):998 -> a
+    980:986:com.android.tools.r8.utils.Visibility computeMinimumRequiredVisibilityForInitClassField(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1082:1088 -> a
+    987:987:void lambda$traceInstanceOf$7(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInstanceOfAnalysis):1121:1121 -> a
+    988:988:void lambda$traceExceptionGuard$8(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerExceptionGuardAnalysis):1126:1126 -> a
+    989:989:void lambda$traceInvokeDirect$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1135:1135 -> a
+    990:996:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1147:1153 -> a
+    997:997:boolean registerDeferredActionForDeadProtoBuilder(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action):1149:1149 -> a
+    998:998:java.lang.Boolean lambda$registerDeferredActionForDeadProtoBuilder$11(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.utils.Action,com.android.tools.r8.ir.analysis.proto.GeneratedMessageLiteBuilderShrinker):1151:1151 -> a
+    999:999:boolean lambda$registerDeferredActionForDeadProtoBuilder$10(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.Action):1152:1152 -> a
+    1000:1009:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1164:1173 -> a
+    1010:1010:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1010:1010:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1173 -> a
+    1011:1012:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1175:1176 -> a
+    1013:1013:void lambda$traceInvokeDirect$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1176:1176 -> a
+    1014:1014:void lambda$traceNewInstance$17(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1311:1311 -> a
+    1015:1015:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1334:1334 -> a
+    1016:1016:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    1016:1016:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1336 -> a
+    1017:1020:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1336:1339 -> a
+    1021:1021:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):1337:1337 -> a
+    1022:1022:java.lang.Boolean lambda$traceStaticFieldRead$18(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1486:1486 -> a
+    1023:1023:java.util.function.Function classReferencedFromReporter(com.android.tools.r8.graph.ProgramMethod):1563:1563 -> a
+    1024:1024:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$classReferencedFromReporter$20(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1563:1563 -> a
+    1025:1040:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1618:1633 -> a
+    1041:1041:void markTypeAsLive(com.android.tools.r8.graph.DexType,java.util.function.Function):1630:1630 -> a
+    1042:1062:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1645:1665 -> a
+    1063:1063:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1063:1063:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1665 -> a
+    1064:1099:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1668:1703 -> a
+    1100:1111:void enqueueFirstNonSerializableClassInitializer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):783:794 -> a
+    1100:1111:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1704 -> a
+    1112:1112:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1707:1707 -> a
+    1113:1113:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    1113:1113:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1710 -> a
+    1114:1125:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1711:1722 -> a
+    1126:1126:java.util.Set com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1466:1466 -> a
+    1126:1126:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1722 -> a
+    1127:1130:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1721:1724 -> a
+    1131:1131:boolean lambda$markTypeAsLive$24(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1713:1713 -> a
+    1132:1132:void lambda$markTypeAsLive$26(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):1724:1724 -> a
+    1133:1136:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexClass):1728:1731 -> a
+    1137:1137:void ensureMethodsContinueToWidenAccess(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.shaking.KeepReason):1736:1736 -> a
+    1138:1140:boolean lambda$ensureMethodsContinueToWidenAccess$28(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1738:1740 -> a
+    1141:1146:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.methodDefinedInInterfaces(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexType):344:349 -> a
+    1141:1146:boolean lambda$ensureMethodsContinueToWidenAccess$28(com.android.tools.r8.shaking.ScopedDexMethodSet,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):1740 -> a
+    1147:1147:void lambda$ensureMethodsContinueToWidenAccess$29(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):1741:1741 -> a
+    1148:1148:void enqueueDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexEncodedMember,java.util.Set):1791:1791 -> a
+    1149:1150:void enqueueHolderWithDependentInstanceConstructor(com.android.tools.r8.graph.ProgramMethod,java.util.Set):1796:1797 -> a
+    1151:1151:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1801:1801 -> a
+    1152:1152:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotationSet):1806:1806 -> a
+    1152:1152:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1801 -> a
+    1153:1154:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation[]):1811:1812 -> a
+    1153:1154:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotationSet):1806 -> a
+    1153:1154:void processAnnotations(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition):1801 -> a
+    1155:1157:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1818:1818 -> a
+    1159:1162:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1820:1823 -> a
+    1163:1163:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    1163:1163:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1823 -> a
+    1164:1169:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1824:1829 -> a
+    1170:1170:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.annotatedOn(com.android.tools.r8.graph.DexDefinition):25:25 -> a
+    1170:1170:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1833 -> a
+    1171:1174:void processAnnotation(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexAnnotation):1834:1837 -> a
+    1175:1178:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1842:1845 -> a
+    1179:1179:void reportMissingField(com.android.tools.r8.graph.DexField):2120:2120 -> a
+    1179:1179:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1846 -> a
+    1180:1180:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1180:1180:void reportMissingField(com.android.tools.r8.graph.DexField):2121 -> a
+    1180:1180:com.android.tools.r8.graph.FieldResolutionResult resolveField(com.android.tools.r8.graph.DexField):1846 -> a
+    1181:1211:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1995:2025 -> a
+    1212:1213:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):800:801 -> a
+    1212:1213:void handleInvokeOfDirectTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):2026 -> a
+    1214:1254:void ensureFromLibraryOrThrow(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):2031:2071 -> a
+    1255:1257:void lambda$ensureFromLibraryOrThrow$32(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexType,java.lang.Boolean):2049:2051 -> a
+    1258:1260:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2083:2085 -> a
+    1261:1261:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():546:546 -> a
+    1261:1261:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2086 -> a
+    1262:1269:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2086:2093 -> a
+    1270:1272:void lambda$keepClassAndAllMembers$33(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2089:2091 -> a
+    1273:1275:void lambda$keepClassAndAllMembers$34(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2095:2097 -> a
+    1276:1276:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2159:2159 -> a
+    1277:1277:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    1277:1277:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2159 -> a
+    1278:1284:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2159:2165 -> a
+    1285:1286:boolean markInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2194:2195 -> a
+    1285:1286:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2168 -> a
+    1287:1288:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2172:2173 -> a
+    1289:1289:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    1289:1289:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2173 -> a
+    1290:1292:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2176:2178 -> a
+    1293:1293:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    1293:1293:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2251 -> a
+    1293:1293:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2181 -> a
+    1294:1295:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2251:2252 -> a
+    1294:1295:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2181 -> a
+    1296:1296:com.android.tools.r8.shaking.InstantiatedObject com.android.tools.r8.shaking.InstantiatedObject.of(com.android.tools.r8.graph.DexProgramClass):12:12 -> a
+    1296:1296:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2254 -> a
+    1296:1296:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2181 -> a
+    1297:1297:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2254:2254 -> a
+    1297:1297:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2181 -> a
+    1298:1298:void transitionMethodsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2253:2253 -> a
+    1298:1298:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2181 -> a
+    1299:1299:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2183:2183 -> a
+    1300:1300:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    1300:1300:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2459 -> a
+    1300:1300:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2185 -> a
+    1301:1303:void transitionDependentItemsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2459:2461 -> a
+    1301:1303:void processNewlyInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):2185 -> a
+    1304:1304:void lambda$processNewlyInstantiatedClass$36(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2166:2166 -> a
+    1305:1305:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2200:2200 -> a
+    1306:1306:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
+    1306:1306:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2200 -> a
+    1307:1308:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2200:2201 -> a
+    1309:1310:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2465:2466 -> a
+    1309:1310:void markAnnotationAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2202 -> a
+    1311:1324:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2266:2279 -> a
+    1325:1325:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> a
+    1325:1325:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2279 -> a
+    1326:1327:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2285:2286 -> a
+    1328:1328:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> a
+    1328:1328:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2287 -> a
+    1329:1335:void transitionMethodsForInstantiatedObject(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,java.util.List):2291:2297 -> a
+    1336:1336:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2302:2302 -> a
+    1336:1336:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2310 -> a
+    1337:1354:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2310:2327 -> a
+    1355:1355:void markProgramMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):2326:2326 -> a
+    1356:1360:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2341:2345 -> a
+    1361:1361:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2344:2344 -> a
+    1362:1373:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2342:2353 -> a
+    1374:1376:com.android.tools.r8.graph.LookupTarget com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult.lookupVirtualDispatchTarget(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.AppInfoWithClassHierarchy):558:560 -> a
+    1374:1376:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2353 -> a
+    1377:1377:void markLiveOverrides(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):2355:2355 -> a
+    1378:1380:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLiveOverrides$37(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):2358:2358 -> a
+    1381:1393:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2365:2377 -> a
+    1394:1394:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2376:2376 -> a
+    1395:1395:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    1395:1395:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2384 -> a
+    1396:1400:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2384:2388 -> a
+    1401:1407:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2387:2393 -> a
+    1408:1408:void markLibraryAndClasspathMethodOverridesAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass):2390:2390 -> a
+    1409:1409:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2402:2402 -> a
+    1410:1452:boolean shouldMarkLibraryMethodOverrideAsReachable(com.android.tools.r8.graph.LookupTarget):3700:3742 -> a
+    1410:1452:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2406 -> a
+    1453:1453:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2409:2409 -> a
+    1454:1454:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    1454:1454:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2414 -> a
+    1455:1455:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2417:2417 -> a
+    1456:1456:void markLibraryOrClasspathOverrideLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ResolutionResult):2416:2416 -> a
+    1457:1457:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markLibraryOrClasspathOverrideLive$38(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.ProgramMethod):2412:2412 -> a
+    1458:1473:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2423:2438 -> a
+    1474:1478:void com.android.tools.r8.graph.DexClass.forEachImmediateSupertype(java.util.function.Consumer):728:732 -> a
+    1474:1478:void markOverridesAsLibraryMethodOverrides(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):2438 -> a
+    1479:1479:void lambda$transitionFieldsForInstantiatedClass$39(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramField):2452:2452 -> a
+    1480:1481:void markFieldAsTargeted(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):2496:2497 -> a
+    1482:1482:void lambda$markInstanceFieldAsLive$44(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2548:2548 -> a
+    1483:1483:boolean isFieldLive(com.android.tools.r8.graph.ProgramField):2583:2583 -> a
+    1484:1484:boolean isFieldLive(com.android.tools.r8.graph.DexEncodedField):2587:2587 -> a
+    1485:1486:boolean isFieldWrittenInMethodSatisfying(com.android.tools.r8.graph.ProgramField,java.util.function.Predicate):2597:2598 -> a
+    1487:1487:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2613:2613 -> a
+    1488:1488:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    1488:1488:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2614 -> a
+    1489:1490:boolean isMemberLive(com.android.tools.r8.graph.DexEncodedMember):2615:2616 -> a
+    1491:1491:boolean isMethodLive(com.android.tools.r8.graph.DexEncodedMethod):2620:2620 -> a
+    1492:1492:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2634:2634 -> a
+    1492:1492:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3539 -> a
+    1493:1497:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3540:3544 -> a
+    1498:1590:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> a
+    1498:1590:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3544 -> a
+    1591:1594:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3546:3549 -> a
+    1595:1595:java.util.Set com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.getDependentKeepClassCompatRule(com.android.tools.r8.graph.DexType):1466:1466 -> a
+    1595:1595:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3550 -> a
+    1596:1596:void lambda$addConsequentRootSet$67(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,com.android.tools.r8.graph.DexProgramClass):3549:3549 -> a
+    1597:1597:void forAllLiveClasses(java.util.function.Consumer):2643:2643 -> a
+    1598:1598:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markInstanceFieldAsReachable$45(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexProgramClass):2655:2655 -> a
+    1599:1615:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2676:2692 -> a
+    1616:1617:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1865:1866 -> a
+    1616:1617:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2696 -> a
+    1618:2127:com.android.tools.r8.graph.ResolutionResult com.android.tools.r8.graph.AppInfoWithClassHierarchy.resolveMethod(com.android.tools.r8.graph.DexMethod,boolean):0:509 -> a
+    1618:2127:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1866 -> a
+    1618:2127:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2696 -> a
+    2128:2132:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason,boolean):1867:1871 -> a
+    2128:2132:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2696 -> a
+    2133:2133:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2701:2701 -> a
+    2134:2134:java.util.Set getReachableVirtualTargets(com.android.tools.r8.graph.DexProgramClass):2302:2302 -> a
+    2134:2134:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2710 -> a
+    2135:2141:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2710:2716 -> a
+    2142:2142:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    2142:2142:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2716 -> a
+    2143:2172:void markVirtualMethodAsReachable(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2721:2750 -> a
+    2173:2173:void lambda$markVirtualMethodAsReachable$48(com.android.tools.r8.graph.DexType,java.util.function.Consumer,java.util.function.Consumer):2747:2747 -> a
+    2174:2174:boolean lambda$markVirtualMethodAsReachable$49(com.android.tools.r8.graph.DexDefinition):2749:2749 -> a
+    2175:2175:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier):135:135 -> a
+    2175:2175:boolean lambda$markVirtualMethodAsReachable$49(com.android.tools.r8.graph.DexDefinition):2749 -> a
+    2176:2176:void lambda$markVirtualMethodAsReachable$51(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.LookupTarget):2752:2752 -> a
+    2177:2177:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markVirtualMethodAsReachable$50(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.ProgramMethod):2755:2755 -> a
+    2178:2179:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2761:2762 -> a
+    2180:2182:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.DexClassAndMethod,java.util.function.Function):2771:2773 -> a
+    2180:2182:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2762 -> a
+    2183:2184:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2764:2765 -> a
+    2185:2187:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupLambdaTarget,java.util.function.Function):2779:2781 -> a
+    2185:2187:void markVirtualDispatchTargetAsLive(com.android.tools.r8.graph.LookupTarget,java.util.function.Function):2765 -> a
+    2188:2189:void markFailedResolutionTargets(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ResolutionResult$FailedResolutionResult,com.android.tools.r8.shaking.KeepReason):2787:2788 -> a
+    2190:2193:void lambda$markFailedResolutionTargets$52(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.DexEncodedMethod):2790:2793 -> a
+    2194:2194:void lambda$markEnumValuesAsReachable$53(com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2816:2816 -> a
+    2195:2202:java.util.Set traceMainDex(com.android.tools.r8.shaking.RootSetBuilder$RootSet,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2867:2874 -> a
+    2203:2208:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2883:2888 -> a
+    2209:2209:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):451:451 -> a
+    2209:2209:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2888 -> a
+    2210:2212:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2892:2894 -> a
+    2213:2213:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):451:451 -> a
+    2213:2213:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2894 -> a
+    2214:2218:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2896:2900 -> a
+    2219:2219:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> a
+    2219:2219:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2900 -> a
+    2220:2243:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2900:2923 -> a
+    2244:2244:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):754:754 -> a
+    2244:2244:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2924 -> a
+    2245:2245:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2926:2926 -> a
+    2246:2246:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):754:754 -> a
+    2246:2246:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2927 -> a
+    2247:2247:void enqueueRootItem(com.android.tools.r8.graph.DexDefinition,java.util.Set):754:754 -> a
+    2247:2247:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2929 -> a
+    2248:2265:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2916:2933 -> a
+    2266:2269:void finalizeLibraryMethodOverrideInformation():3163:3166 -> a
+    2266:2269:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2934 -> a
+    2270:2271:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2935:2936 -> a
+    2272:2274:boolean verifyKeptGraph():3173:3175 -> a
+    2272:2274:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2936 -> a
+    2275:2275:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2937:2937 -> a
+    2276:2461:boolean com.android.tools.r8.shaking.Enqueuer$Mode.isWhyAreYouKeeping():0:185 -> a
+    2276:2461:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2937 -> a
+    2462:2464:com.android.tools.r8.shaking.AppInfoWithLiveness traceApplication(com.android.tools.r8.shaking.RootSetBuilder$RootSet,com.android.tools.r8.shaking.ProguardClassFilter,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):2942:2944 -> a
+    2465:2466:void lambda$traceApplication$55(com.android.tools.r8.graph.DexReference,java.util.List):2910:2911 -> a
+    2467:2467:void lambda$traceApplication$56(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2935:2935 -> a
+    2468:2468:com.android.tools.r8.graph.GraphLens$NestedGraphLens buildGraphLens():2950:2950 -> a
+    2469:2469:void lambda$keepClassWithRules$57(com.android.tools.r8.graph.DexProgramClass,java.util.Set,com.android.tools.r8.shaking.KeepClassInfo$Joiner):2954:2954 -> a
+    2470:2470:void lambda$keepMethodWithRules$58(com.android.tools.r8.graph.ProgramMethod,java.util.Set,com.android.tools.r8.shaking.KeepMethodInfo$Joiner):2958:2958 -> a
+    2471:2471:void keepFieldWithRules(com.android.tools.r8.graph.ProgramField,java.util.Set):2962:2962 -> a
+    2472:2472:void lambda$keepFieldWithRules$59(com.android.tools.r8.graph.ProgramField,java.util.Set,com.android.tools.r8.shaking.KeepFieldInfo$Joiner):2962:2962 -> a
+    2473:2473:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2969:2969 -> a
+    2474:2474:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
+    2474:2474:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2971 -> a
+    2475:2475:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2971:2971 -> a
+    2476:2476:com.android.tools.r8.shaking.ProguardKeepRule com.android.tools.r8.shaking.ProguardIfRule.getSubsequentRule():42:42 -> a
+    2476:2476:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2971 -> a
+    2477:2481:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2972:2976 -> a
+    2482:2482:boolean com.android.tools.r8.graph.AccessFlags.isPackagePrivateOrProtected():132:132 -> a
+    2482:2482:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2976 -> a
+    2483:2490:void applyKeepRules(com.android.tools.r8.graph.ProgramDefinition,java.util.Set,com.android.tools.r8.shaking.KeepInfo$Joiner):2977:2984 -> a
+    2491:2491:com.android.tools.r8.graph.DexApplication lambda$synthesize$60(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3099:3099 -> a
+    2492:2497:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendApplication(com.android.tools.r8.graph.DirectMappedDexApplication$Builder):3041:3046 -> a
+    2492:2497:com.android.tools.r8.graph.DexApplication lambda$synthesize$60(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3100 -> a
+    2498:2498:com.android.tools.r8.graph.DexApplication lambda$synthesize$60(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions,com.android.tools.r8.graph.DexApplication):3101:3101 -> a
+    2499:2500:void synthesizeBackports(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3123:3124 -> a
+    2501:2529:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3186:3214 -> a
+    2530:2530:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    2530:2530:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3215 -> a
+    2531:2531:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3216:3216 -> a
+    2532:2532:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> a
+    2532:2532:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3217 -> a
+    2533:2570:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3218:3255 -> a
+    2571:2576:com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap joinIdentifierNameStrings(java.util.Set,java.util.Set):3430:3435 -> a
+    2571:2576:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3276 -> a
+    2577:2582:com.android.tools.r8.shaking.AppInfoWithLiveness createAppInfo(com.android.tools.r8.graph.AppInfoWithClassHierarchy):3277:3282 -> a
+    2583:2583:void lambda$createAppInfo$61(java.util.Set,com.android.tools.r8.graph.DexProgramClass):3192:3192 -> a
+    2584:2584:boolean lambda$createAppInfo$62(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.FieldAccessInfoImpl):3198:3198 -> a
+    2585:2597:void lambda$ensureLambdaAccessibility$63(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3294:3306 -> a
+    2598:2670:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():0:72 -> a
+    2598:2670:void lambda$ensureLambdaAccessibility$63(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3306 -> a
+    2671:2671:void lambda$ensureLambdaAccessibility$63(com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.desugar.LambdaClass):3306:3306 -> a
+    2672:2678:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3338:3344 -> a
+    2679:2690:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3372:3383 -> a
+    2679:2690:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3344 -> a
+    2691:2691:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2624:2624 -> a
+    2691:2691:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3383 -> a
+    2691:2691:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3344 -> a
+    2692:2692:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3384:3384 -> a
+    2692:2692:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3344 -> a
+    2693:2695:boolean verifyReferencedMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3392:3394 -> a
+    2693:2695:boolean verifyReferencedType(com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3384 -> a
+    2693:2695:boolean verifyReferences(com.android.tools.r8.graph.DexApplication):3344 -> a
+    2696:2710:boolean verifyReferencedType(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.WorkList,com.android.tools.r8.graph.DexApplication):3351:3365 -> a
+    2711:2713:void rewriteLambdaCallSites(com.android.tools.r8.graph.DexEncodedMethod,java.util.Map):3414:3416 -> a
+    2714:2797:void trace(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):3441:3524 -> a
+    2798:2798:java.util.Set lambda$trace$65(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):3460:3460 -> a
+    2799:2799:void lambda$trace$66(com.android.tools.r8.utils.Timing,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3492:3492 -> a
+    2800:2800:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3536:3536 -> a
+    2801:2801:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1366:1366 -> a
+    2801:2801:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2104 -> a
+    2801:2801:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3536 -> a
+    2802:2802:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
+    2802:2802:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1367 -> a
+    2802:2802:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2104 -> a
+    2802:2802:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3536 -> a
+    2803:2803:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1368:1368 -> a
+    2803:2803:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2104 -> a
+    2803:2803:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3536 -> a
+    2804:2804:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    2804:2804:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1369 -> a
+    2804:2804:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2104 -> a
+    2804:2804:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3536 -> a
+    2805:2807:void com.android.tools.r8.shaking.RootSetBuilder$RootSetBase.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):1369:1371 -> a
+    2805:2807:void com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet.forEachClassWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):2104 -> a
+    2805:2807:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3536 -> a
+    2808:2833:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3553:3578 -> a
+    2834:2834:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1603:1603 -> a
+    2834:2834:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1597 -> a
+    2834:2834:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3578 -> a
+    2835:2835:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1613:1613 -> a
+    2835:2835:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1623 -> a
+    2835:2835:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1598 -> a
+    2835:2835:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3578 -> a
+    2836:2836:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1636:1636 -> a
+    2836:2836:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1624 -> a
+    2836:2836:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1598 -> a
+    2836:2836:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3578 -> a
+    2837:2840:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):3581:3584 -> a
+    2841:2842:void lambda$addConsequentRootSet$68(com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):3556:3557 -> a
+    2843:2844:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3562:3563 -> a
+    2845:2845:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachClass(java.util.function.Consumer):1603:1603 -> a
+    2845:2845:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1597 -> a
+    2845:2845:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3563 -> a
+    2846:2846:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1613:1613 -> a
+    2846:2846:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1623 -> a
+    2846:2846:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1598 -> a
+    2846:2846:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3563 -> a
+    2847:2847:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1636:1636 -> a
+    2847:2847:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1624 -> a
+    2847:2847:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachReference(java.util.function.Consumer):1598 -> a
+    2847:2847:void lambda$addConsequentRootSet$70(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):3563 -> a
+    2848:2850:void retainAnnotationForFinalTreeShaking(java.util.List):3649:3651 -> a
+    2851:2851:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3692:3692 -> a
+    2852:2852:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
+    2852:2852:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3692 -> a
+    2853:2855:void markFieldAsKept(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):3693:3695 -> a
+    2856:2864:java.util.Set getImmediateSubtypesInInstantiatedHierarchy(com.android.tools.r8.graph.DexProgramClass):3751:3759 -> a
+    2865:2865:void lambda$markMethodAsLive$73(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):3789:3789 -> a
+    2866:2866:void lambda$markMethodAsLive$74(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):3798:3798 -> a
+    2867:2877:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3802:3812 -> a
+    2878:2880:void checkMemberForSoftPinning(com.android.tools.r8.graph.ProgramMember):3811:3813 -> a
+    2881:2881:boolean lambda$checkMemberForSoftPinning$75(com.android.tools.r8.shaking.ProguardKeepRuleBase):3805:3805 -> a
+    2882:2888:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4113:4119 -> a
+    2889:2889:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> a
+    2889:2889:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4119 -> a
+    2890:2906:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4124:4140 -> a
+    2907:2907:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> a
+    2907:2907:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4141 -> a
+    2908:2912:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4142:4146 -> a
+    2913:2913:void com.android.tools.r8.graph.DexProgramClass.forEachProgramVirtualMethod(java.util.function.Consumer):185:185 -> a
+    2913:2913:void handleJavaLangReflectProxyNewProxyInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4146 -> a
+    2914:2926:void handleServiceInstantiation(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):4203:4215 -> a
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.targetedBySuperFrom(com.android.tools.r8.graph.ProgramMethod):77:77 -> b
-    1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2683 -> b
-    2:8:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1774:1780 -> b
-    2:8:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2684 -> b
-    9:12:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2689:2692 -> b
-    13:33:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2690:2710 -> b
+    1:1:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2823 -> b
+    2:8:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1853:1859 -> b
+    2:8:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2824 -> b
+    9:12:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2829:2832 -> b
+    13:33:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2830:2850 -> b
     34:34:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    34:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2710 -> b
-    35:38:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2712:2715 -> b
+    34:34:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2850 -> b
+    35:38:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2852:2855 -> b
     39:39:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> b
-    39:39:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2716 -> b
-    40:41:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2716:2717 -> b
+    39:39:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2856 -> b
+    40:41:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2856:2857 -> b
     42:42:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> b
-    42:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2718 -> b
-    43:43:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2718:2718 -> b
-    44:44:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1100(com.android.tools.r8.shaking.Enqueuer):156:156 -> b
-    45:45:com.android.tools.r8.graph.DexClass access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):156:156 -> b
-    46:46:void access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):156:156 -> b
-    47:47:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):435:435 -> b
-    48:49:void setInitialMissingTypes(java.util.Set):469:470 -> b
-    50:50:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
-    50:50:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3703 -> b
-    51:60:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3704:3713 -> b
-    61:61:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3711:3711 -> b
-    62:62:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):538:538 -> b
-    63:63:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
-    63:63:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):538 -> b
-    64:67:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):540:543 -> b
-    68:76:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):554:562 -> b
-    68:76:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):544 -> b
-    77:77:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):568:568 -> b
-    77:77:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):563 -> b
-    77:77:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):544 -> b
-    78:78:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    78:78:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):569 -> b
-    78:78:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):563 -> b
-    78:78:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):544 -> b
-    79:81:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):571:573 -> b
-    79:81:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):563 -> b
-    79:81:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):544 -> b
-    82:86:void warnIfLibraryTypeInheritsFromProgramType(com.android.tools.r8.graph.DexLibraryClass):619:623 -> b
-    82:86:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):573 -> b
-    82:86:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):563 -> b
-    82:86:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):544 -> b
-    87:97:void processNewLiveNonProgramType(com.android.tools.r8.graph.DexClass,java.util.Deque):575:585 -> b
-    87:97:void addLiveNonProgramType(com.android.tools.r8.graph.DexClass):563 -> b
-    87:97:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):544 -> b
-    98:99:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):771:772 -> b
-    98:99:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2412 -> b
-    100:100:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2417:2417 -> b
-    101:103:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1510:1512 -> b
-    101:103:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2417 -> b
-    104:104:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2418:2418 -> b
-    105:105:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1517:1517 -> b
-    105:105:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2418 -> b
-    106:107:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2419:2420 -> b
-    108:108:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    108:108:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2420 -> b
-    109:109:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):811:811 -> b
-    109:109:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1329 -> b
-    110:129:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1334:1353 -> b
-    130:130:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    130:130:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1353 -> b
-    131:135:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1358:1362 -> b
-    136:136:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1360:1360 -> b
-    137:137:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> b
-    137:137:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1366 -> b
-    138:138:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1367:1367 -> b
-    139:140:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):819:820 -> b
-    141:142:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):925:926 -> b
-    143:152:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1114:1123 -> b
-    153:153:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    153:153:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1123 -> b
-    154:155:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1125:1126 -> b
-    156:156:void lambda$traceInvokeInterface$12(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1126:1126 -> b
-    157:157:java.lang.Boolean lambda$traceStaticFieldWrite$18(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1469:1469 -> b
-    158:173:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1522:1537 -> b
-    174:174:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1534:1534 -> b
-    175:175:void lambda$markTypeAsLive$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1637:1637 -> b
-    176:206:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1669:1699 -> b
-    207:207:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1675:1675 -> b
-    208:208:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1851:1851 -> b
-    209:209:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1974:1974 -> b
-    210:210:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    210:210:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):1975 -> b
-    211:211:void lambda$markMethodAsTargeted$35(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):1995:1995 -> b
-    212:212:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$40(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2356:2356 -> b
-    213:213:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$42(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexProgramClass):2365:2365 -> b
-    214:214:void lambda$markStaticFieldAsLive$43(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2390:2390 -> b
-    215:218:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2394:2397 -> b
-    219:219:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
-    219:219:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2397 -> b
-    220:229:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2399:2408 -> b
-    230:230:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2438:2438 -> b
-    231:232:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2451:2452 -> b
-    233:233:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2484:2484 -> b
-    234:234:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2494:2494 -> b
-    235:236:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2498:2499 -> b
-    237:237:void keepClassWithRules(com.android.tools.r8.graph.DexProgramClass,java.util.Set):2814:2814 -> b
-    238:238:void keepMethodWithRules(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2818:2818 -> b
-    239:243:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2973:2977 -> b
-    244:246:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethod(com.android.tools.r8.graph.ProgramMethod):2889:2891 -> b
-    244:246:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):2896 -> b
-    244:246:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2977 -> b
-    247:247:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):2897:2897 -> b
-    247:247:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2977 -> b
-    248:248:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2979:2979 -> b
-    249:250:void lambda$addConsequentRootSet$69(com.android.tools.r8.graph.DexReference):3426:3427 -> b
-    251:251:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3447:3447 -> b
-    252:252:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
-    252:252:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3447 -> b
-    253:253:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> b
-    253:253:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3448 -> b
-    254:255:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3448:3449 -> b
-    256:256:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3467:3467 -> b
-    257:257:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):139:139 -> b
-    257:257:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3467 -> b
-    258:261:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3468:3471 -> b
-    262:265:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3482:3485 -> b
-    262:265:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    266:266:boolean com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.containsMethod(com.android.tools.r8.graph.DexMethod):1587:1587 -> b
-    266:266:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3485 -> b
-    266:266:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    267:278:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3489:3500 -> b
-    267:278:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    279:351:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():0:72 -> b
-    279:351:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3502 -> b
-    279:351:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    352:357:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3498:3503 -> b
-    352:357:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    358:430:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():0:72 -> b
-    358:430:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3503 -> b
-    358:430:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    431:432:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):771:772 -> b
-    431:432:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3503 -> b
-    431:432:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    433:433:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3506:3506 -> b
-    433:433:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3470 -> b
-    434:434:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3474:3474 -> b
-    435:435:boolean lambda$checkMemberForSoftPinning$76(com.android.tools.r8.shaking.ProguardKeepRuleBase):3673:3673 -> b
-    436:438:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3695:3697 -> b
-    439:439:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():614:614 -> b
-    439:439:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3697 -> b
-    440:440:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3697:3697 -> b
-    441:444:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3723:3726 -> b
-    445:451:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3732:3738 -> b
-    445:451:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    452:459:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3833:3840 -> b
-    452:459:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3739 -> b
-    452:459:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    460:462:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3839:3841 -> b
-    460:462:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3739 -> b
-    460:462:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    463:463:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():411:411 -> b
-    463:463:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType):615 -> b
-    463:463:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3847 -> b
-    463:463:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3739 -> b
-    463:463:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    464:464:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType):615:615 -> b
-    464:464:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3847 -> b
-    464:464:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3739 -> b
-    464:464:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    465:465:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3851:3851 -> b
-    465:465:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3739 -> b
-    465:465:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    466:466:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    466:466:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3853 -> b
-    466:466:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3739 -> b
-    466:466:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    467:469:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3854:3856 -> b
-    467:469:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3739 -> b
-    467:469:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    470:470:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3742:3742 -> b
-    470:470:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    471:491:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3863:3883 -> b
-    471:491:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3743 -> b
-    471:491:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    492:505:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3882:3895 -> b
-    492:505:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3743 -> b
-    492:505:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    506:506:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b
-    506:506:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3895 -> b
-    506:506:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3743 -> b
-    506:506:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    507:555:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3900:3948 -> b
-    507:555:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3743 -> b
-    507:555:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    556:556:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    556:556:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3953 -> b
-    556:556:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3743 -> b
-    556:556:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    557:559:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3954:3956 -> b
-    557:559:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3743 -> b
-    557:559:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    560:560:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3746:3746 -> b
-    560:560:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    561:564:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4013:4016 -> b
-    561:564:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3747 -> b
-    561:564:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    565:565:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> b
-    565:565:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4017 -> b
-    565:565:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3747 -> b
-    565:565:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    566:566:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> b
-    566:566:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> b
-    566:566:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4017 -> b
-    566:566:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3747 -> b
-    566:566:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    567:567:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4017:4017 -> b
-    567:567:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3747 -> b
-    567:567:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    568:572:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3750:3754 -> b
-    568:572:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    573:579:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4023:4029 -> b
-    573:579:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    573:579:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    580:580:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> b
-    580:580:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4029 -> b
-    580:580:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    580:580:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    581:592:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4030:4041 -> b
-    581:592:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    581:592:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    593:593:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4034:4034 -> b
-    593:593:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    593:593:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    594:594:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    594:594:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4046 -> b
-    594:594:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    594:594:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    595:595:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4046:4046 -> b
-    595:595:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    595:595:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    596:596:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    596:596:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4048 -> b
-    596:596:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    596:596:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    597:598:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4049:4050 -> b
-    597:598:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3755 -> b
-    597:598:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    599:602:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3758:3761 -> b
-    599:602:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    603:603:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
-    603:603:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3765 -> b
-    603:603:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    604:604:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3766:3766 -> b
-    604:604:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    605:605:com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo():411:411 -> b
-    605:605:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType):615 -> b
-    605:605:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3766 -> b
-    605:605:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    606:606:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType):615:615 -> b
-    606:606:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3766 -> b
-    606:606:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    607:607:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
-    607:607:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3770 -> b
-    607:607:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    608:611:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3770:3773 -> b
-    608:611:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    612:612:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    612:612:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3774 -> b
-    612:612:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    613:616:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3773:3776 -> b
-    613:616:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    617:617:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    617:617:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3777 -> b
-    617:617:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    618:619:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3778:3779 -> b
-    618:619:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    620:620:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3771:3771 -> b
-    620:620:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    621:621:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    621:621:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3771 -> b
-    621:621:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    622:639:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3771:3788 -> b
-    622:639:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    640:640:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> b
-    640:640:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3798 -> b
-    640:640:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    641:644:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3798:3801 -> b
-    641:644:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    645:645:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    645:645:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3802 -> b
-    645:645:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    646:651:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3801:3806 -> b
-    646:651:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    652:652:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    652:652:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3807 -> b
-    652:652:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    653:666:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3807:3820 -> b
-    653:666:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    667:667:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
-    667:667:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3821 -> b
-    667:667:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    668:672:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3822:3826 -> b
-    668:672:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    673:674:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3823:3824 -> b
-    673:674:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3727 -> b
-    675:676:void lambda$handleJavaLangReflectProxyNewProxyInstance$80(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4001:4002 -> b
-    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1800(com.android.tools.r8.shaking.Enqueuer):156:156 -> c
-    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():423:427 -> c
-    7:8:void setInitialPrunedTypes(java.util.Set):474:475 -> c
-    9:10:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):608:609 -> c
-    11:12:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):771:772 -> c
-    11:12:boolean access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):156 -> c
-    13:13:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):803:803 -> c
-    13:13:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1380 -> c
-    14:33:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1384:1403 -> c
+    42:42:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2858 -> b
+    43:43:void markSuperMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):2858:2858 -> b
+    44:44:com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection access$1100(com.android.tools.r8.shaking.Enqueuer):160:160 -> b
+    45:45:com.android.tools.r8.graph.DexClass access$2500(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexType):160:160 -> b
+    46:46:void access$800(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):160:160 -> b
+    47:47:com.android.tools.r8.shaking.Enqueuer registerAnalysis(com.android.tools.r8.graph.analysis.EnqueuerAnalysis):451:451 -> b
+    48:49:void setInitialMissingTypes(java.util.Set):485:486 -> b
+    50:50:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> b
+    50:50:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3842 -> b
+    51:60:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3843:3852 -> b
+    61:61:void markClassAsInstantiatedWithCompatRule(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):3850:3850 -> b
+    62:62:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> b
+    63:64:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):800:801 -> b
+    63:64:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2552 -> b
+    65:65:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2557:2557 -> b
+    66:68:boolean verifyMethodIsTargeted(com.android.tools.r8.graph.ProgramMethod):1585:1587 -> b
+    66:68:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2557 -> b
+    69:69:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2558:2558 -> b
+    70:70:boolean verifyTypeIsLive(com.android.tools.r8.graph.DexProgramClass):1592:1592 -> b
+    70:70:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2558 -> b
+    71:72:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2559:2560 -> b
+    73:73:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    73:73:void markDirectStaticOrConstructorMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2560 -> b
+    74:74:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):840:840 -> b
+    74:74:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1404 -> b
+    75:94:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1409:1428 -> b
+    95:95:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    95:95:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1428 -> b
+    96:100:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1433:1437 -> b
+    101:101:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1435:1435 -> b
+    102:102:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> b
+    102:102:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1441 -> b
+    103:103:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1442:1442 -> b
+    104:105:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):848:849 -> b
+    106:107:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):954:955 -> b
+    108:117:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1189:1198 -> b
+    118:118:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    118:118:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1198 -> b
+    119:120:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1200:1201 -> b
+    121:121:void lambda$traceInvokeInterface$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1201:1201 -> b
+    122:122:java.lang.Boolean lambda$traceStaticFieldWrite$19(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.ir.analysis.proto.GeneratedExtensionRegistryShrinker):1544:1544 -> b
+    123:135:void markTypeAsLive(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.KeepReason):1597:1609 -> b
+    136:136:void lambda$markTypeAsLive$25(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexAnnotation):1714:1714 -> b
+    137:169:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1746:1778 -> b
+    170:170:void markInterfaceTypeAsLiveViaInheritanceClause(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1754:1754 -> b
+    171:171:void markNonStaticDirectMethodAsReachable(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1991:1991 -> b
+    172:172:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):2114:2114 -> b
+    173:173:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    173:173:void reportMissingMethod(com.android.tools.r8.graph.DexMethod):2115 -> b
+    174:174:void lambda$markMethodAsTargeted$35(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexAnnotation):2135:2135 -> b
+    175:175:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$40(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2496:2496 -> b
+    176:176:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markStaticFieldAsLive$42(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.DexProgramClass):2505:2505 -> b
+    177:177:void lambda$markStaticFieldAsLive$43(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.graph.analysis.EnqueuerAnalysis):2530:2530 -> b
+    178:181:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2534:2537 -> b
+    182:182:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> b
+    182:182:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2537 -> b
+    183:192:void markInstanceFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2539:2548 -> b
+    193:193:boolean isFieldReferenced(com.android.tools.r8.graph.DexEncodedField):2578:2578 -> b
+    194:195:boolean isFieldRead(com.android.tools.r8.graph.ProgramField):2591:2592 -> b
+    196:196:boolean isMethodTargeted(com.android.tools.r8.graph.DexEncodedMethod):2624:2624 -> b
+    197:197:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2634:2634 -> b
+    198:199:boolean isNonProgramTypeLive(com.android.tools.r8.graph.DexClass):2638:2639 -> b
+    200:200:void keepClassWithRules(com.android.tools.r8.graph.DexProgramClass,java.util.Set):2954:2954 -> b
+    201:201:void keepMethodWithRules(com.android.tools.r8.graph.ProgramMethod,java.util.Set):2958:2958 -> b
+    202:206:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3113:3117 -> b
+    207:209:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3029:3031 -> b
+    207:209:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3036 -> b
+    207:209:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3117 -> b
+    210:210:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addLiveMethodWithKeepAction(com.android.tools.r8.graph.ProgramMethod,java.util.function.Consumer):3037:3037 -> b
+    210:210:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3117 -> b
+    211:211:void synthesizeInterfaceMethodBridges(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3119:3119 -> b
+    212:213:void lambda$addConsequentRootSet$69(com.android.tools.r8.graph.DexReference):3565:3566 -> b
+    214:214:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3586:3586 -> b
+    215:215:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
+    215:215:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3586 -> b
+    216:216:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexType.asDexType():0:0 -> b
+    216:216:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3587 -> b
+    217:218:void lambda$addConsequentRootSet$72(com.android.tools.r8.graph.DexType,java.util.Set):3587:3588 -> b
+    219:219:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3606:3606 -> b
+    220:220:void com.android.tools.r8.shaking.RootSetBuilder.<init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):140:140 -> b
+    220:220:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3606 -> b
+    221:224:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3607:3610 -> b
+    225:228:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3621:3624 -> b
+    225:228:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    229:229:boolean com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.containsMethod(com.android.tools.r8.graph.DexMethod):1593:1593 -> b
+    229:229:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3624 -> b
+    229:229:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    230:241:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3628:3639 -> b
+    230:241:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    242:314:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():0:72 -> b
+    242:314:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3641 -> b
+    242:314:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    315:320:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3637:3642 -> b
+    315:320:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    321:393:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():0:72 -> b
+    321:393:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3642 -> b
+    321:393:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    394:395:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):800:801 -> b
+    394:395:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3642 -> b
+    394:395:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    396:396:void handleInterfaceMethodSyntheticBridgeAction(com.android.tools.r8.shaking.DelayedRootSetActionItem$InterfaceMethodSyntheticBridgeAction,com.android.tools.r8.shaking.RootSetBuilder):3645:3645 -> b
+    396:396:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3609 -> b
+    397:397:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet computeDelayedInterfaceMethodSyntheticBridges():3613:3613 -> b
+    398:398:boolean lambda$checkMemberForSoftPinning$76(com.android.tools.r8.shaking.ProguardKeepRuleBase):3812:3812 -> b
+    399:401:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3834:3836 -> b
+    402:402:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():632:632 -> b
+    402:402:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3836 -> b
+    403:403:void markClassAsInstantiatedWithReason(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3836:3836 -> b
+    404:407:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3862:3865 -> b
+    408:414:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3871:3877 -> b
+    408:414:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    415:422:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3979:3986 -> b
+    415:422:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3878 -> b
+    415:422:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    423:435:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3985:3997 -> b
+    423:435:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3878 -> b
+    423:435:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    436:436:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    436:436:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):3999 -> b
+    436:436:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3878 -> b
+    436:436:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    437:439:void handleJavaLangClassNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4000:4002 -> b
+    437:439:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3878 -> b
+    437:439:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    440:440:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3881:3881 -> b
+    440:440:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    441:462:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4009:4030 -> b
+    441:462:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3882 -> b
+    441:462:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    463:476:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4029:4042 -> b
+    463:476:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3882 -> b
+    463:476:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    477:477:boolean com.android.tools.r8.ir.code.Instruction.isNewArrayEmpty():0:0 -> b
+    477:477:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4042 -> b
+    477:477:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3882 -> b
+    477:477:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    478:526:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4047:4095 -> b
+    478:526:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3882 -> b
+    478:526:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    527:527:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    527:527:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4100 -> b
+    527:527:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3882 -> b
+    527:527:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    528:530:void handleJavaLangReflectConstructorNewInstance(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4101:4103 -> b
+    528:530:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3882 -> b
+    528:530:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    531:531:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3885:3885 -> b
+    531:531:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    532:535:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4160:4163 -> b
+    532:535:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3886 -> b
+    532:535:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    536:536:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> b
+    536:536:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4164 -> b
+    536:536:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3886 -> b
+    536:536:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    537:537:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> b
+    537:537:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> b
+    537:537:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4164 -> b
+    537:537:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3886 -> b
+    537:537:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    538:538:void handleJavaLangEnumValueOf(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4164:4164 -> b
+    538:538:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3886 -> b
+    538:538:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    539:543:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3889:3893 -> b
+    539:543:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    544:550:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4170:4176 -> b
+    544:550:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    544:550:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    551:551:boolean com.android.tools.r8.ir.code.Instruction.isConstClass():0:0 -> b
+    551:551:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4176 -> b
+    551:551:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    551:551:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    552:563:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4177:4188 -> b
+    552:563:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    552:563:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    564:564:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4181:4181 -> b
+    564:564:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    564:564:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    565:565:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    565:565:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4193 -> b
+    565:565:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    565:565:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    566:566:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4193:4193 -> b
+    566:566:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    566:566:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    567:567:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    567:567:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4195 -> b
+    567:567:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    567:567:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    568:569:void handleServiceLoaderInvocation(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.InvokeMethod):4196:4197 -> b
+    568:569:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3894 -> b
+    568:569:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    570:578:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3897:3905 -> b
+    570:578:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    579:579:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
+    579:579:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3906 -> b
+    579:579:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    580:583:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3907:3910 -> b
+    580:583:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    584:584:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    584:584:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3914 -> b
+    584:584:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    585:585:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3914:3914 -> b
+    585:585:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    586:586:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():515:515 -> b
+    586:586:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3915 -> b
+    586:586:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    587:587:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> b
+    587:587:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():515 -> b
+    587:587:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3915 -> b
+    587:587:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    588:588:boolean com.android.tools.r8.graph.DexClass.canBeInstantiatedByNewInstance():515:515 -> b
+    588:588:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3915 -> b
+    588:588:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    589:591:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3915:3917 -> b
+    589:591:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    592:592:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    592:592:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3918 -> b
+    592:592:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    593:596:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3917:3920 -> b
+    593:596:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    597:597:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    597:597:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3921 -> b
+    597:597:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    598:610:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3922:3934 -> b
+    598:610:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    611:611:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> b
+    611:611:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3944 -> b
+    611:611:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    612:615:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3944:3947 -> b
+    612:615:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    616:616:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    616:616:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3948 -> b
+    616:616:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    617:622:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3947:3952 -> b
+    617:622:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    623:623:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    623:623:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3953 -> b
+    623:623:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    624:637:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3953:3966 -> b
+    624:637:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    638:638:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.reflectiveUseIn(com.android.tools.r8.graph.ProgramMethod):81:81 -> b
+    638:638:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3967 -> b
+    638:638:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    639:643:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3968:3972 -> b
+    639:643:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    644:645:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.Instruction):3969:3970 -> b
+    644:645:void handleReflectiveBehavior(com.android.tools.r8.graph.ProgramMethod):3866 -> b
+    646:647:void lambda$handleJavaLangReflectProxyNewProxyInstance$80(com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.graph.ProgramMethod):4148:4149 -> b
+    1:1:com.android.tools.r8.graph.FieldAccessInfoCollectionImpl access$1800(com.android.tools.r8.shaking.Enqueuer):160:160 -> c
+    2:6:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory createUseRegistryFactory():439:443 -> c
+    7:8:void setInitialPrunedTypes(java.util.Set):490:491 -> c
+    9:9:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> c
+    9:9:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):637 -> c
+    10:10:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNull(com.android.tools.r8.graph.DexType):638:638 -> c
+    11:12:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):800:801 -> c
+    11:12:boolean access$900(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):160 -> c
+    13:13:boolean registerFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):832:832 -> c
+    13:13:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1455 -> c
+    14:33:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1459:1478 -> c
     34:34:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    34:34:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1403 -> c
-    35:41:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1406:1412 -> c
-    42:47:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1409:1414 -> c
-    48:48:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):484:484 -> c
-    48:48:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1414 -> c
-    49:52:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1419:1422 -> c
+    34:34:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1478 -> c
+    35:41:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1481:1487 -> c
+    42:47:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1484:1489 -> c
+    48:48:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):500:500 -> c
+    48:48:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1489 -> c
+    49:52:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1494:1497 -> c
     53:53:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> c
-    53:53:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1425 -> c
-    54:54:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1425:1425 -> c
-    55:55:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):807:807 -> c
-    56:63:void traceConstClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):932:939 -> c
-    64:65:boolean registerBackportInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1138:1139 -> c
-    66:94:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1147:1175 -> c
-    95:95:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    95:95:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1175 -> c
-    96:102:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1774:1780 -> c
-    96:102:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1796 -> c
-    96:102:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1177 -> c
-    103:117:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1797:1811 -> c
-    103:117:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1177 -> c
-    118:118:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1178:1178 -> c
-    119:119:void lambda$traceInvokeStatic$13(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1178:1178 -> c
-    120:120:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2066:2066 -> c
-    121:121:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> c
-    121:121:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2066 -> c
-    122:127:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2066:2071 -> c
-    128:129:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2325:2326 -> c
-    128:129:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2072 -> c
-    130:130:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$41(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2357:2357 -> c
-    131:135:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2462:2466 -> c
-    136:750:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:614 -> c
-    136:750:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2466 -> c
-    751:752:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2468:2469 -> c
-    753:754:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2488:2489 -> c
-    755:755:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2494:2494 -> c
-    755:755:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2489 -> c
-    756:756:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2490:2490 -> c
-    757:758:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2508:2509 -> c
-    759:759:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    759:759:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2509 -> c
-    760:760:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2513:2513 -> c
-    761:764:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2512:2515 -> c
-    765:772:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2514:2521 -> c
-    773:773:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> c
-    773:773:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2521 -> c
-    774:776:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2522:2524 -> c
-    777:869:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> c
-    777:869:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2523 -> c
-    870:875:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2525:2530 -> c
-    876:876:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markInstanceFieldAsReachable$46(com.android.tools.r8.graph.DexProgramClass):2529:2529 -> c
-    877:881:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2659:2663 -> c
-    877:881:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671 -> c
-    882:887:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2662:2667 -> c
-    882:887:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671 -> c
-    888:894:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2671:2677 -> c
-    895:895:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$54(com.android.tools.r8.graph.DexEncodedMethod):2713:2713 -> c
-    896:906:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2989:2999 -> c
-    907:910:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,boolean):2876:2879 -> c
-    907:910:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2999 -> c
-    911:911:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3001:3001 -> c
-    912:912:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> c
-    912:912:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3002 -> c
-    913:929:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3003:3019 -> c
-    930:931:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):2990:2991 -> c
-    932:932:void lambda$addConsequentRootSet$71(com.android.tools.r8.graph.DexReference):3440:3440 -> c
-    933:956:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3518:3541 -> c
-    957:965:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3539:3547 -> c
-    966:979:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3628:3641 -> c
-    980:980:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
-    980:980:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3641 -> c
-    981:981:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
-    981:981:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3643 -> c
-    982:982:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3643:3643 -> c
-    983:983:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
-    983:983:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3644 -> c
-    984:999:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3644:3659 -> c
-    1:1:com.android.tools.r8.utils.InternalOptions access$2000(com.android.tools.r8.shaking.Enqueuer):156:156 -> d
-    2:2:boolean isPinned(com.android.tools.r8.graph.DexType):550:550 -> d
-    3:3:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> d
-    3:3:boolean isPinned(com.android.tools.r8.graph.DexType):550 -> d
-    4:4:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):78:78 -> d
-    4:4:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139 -> d
-    4:4:boolean isPinned(com.android.tools.r8.graph.DexType):550 -> d
-    5:5:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramClass():38:38 -> d
-    5:5:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):79 -> d
-    5:5:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139 -> d
-    5:5:boolean isPinned(com.android.tools.r8.graph.DexType):550 -> d
-    6:6:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):79:79 -> d
-    6:6:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139 -> d
-    6:6:boolean isPinned(com.android.tools.r8.graph.DexType):550 -> d
-    7:7:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139:139 -> d
-    7:7:boolean isPinned(com.android.tools.r8.graph.DexType):550 -> d
-    8:8:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):811:811 -> d
-    8:8:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1438 -> d
-    9:28:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1442:1461 -> d
-    29:29:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    29:29:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1461 -> d
-    30:36:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1464:1470 -> d
-    37:42:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1467:1472 -> d
-    43:43:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):484:484 -> d
-    43:43:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1472 -> d
-    44:47:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1477:1480 -> d
-    48:48:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> d
-    48:48:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1483 -> d
-    49:49:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1483:1483 -> d
-    50:50:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):815:815 -> d
-    51:51:java.util.Map lambda$traceCallSite$3(com.android.tools.r8.graph.DexEncodedMethod):880:880 -> d
-    52:52:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):943:943 -> d
-    53:53:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1042:1042 -> d
-    53:53:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):944 -> d
-    54:60:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):947:953 -> d
-    61:61:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):952:952 -> d
-    62:68:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1056:1062 -> d
-    69:69:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> d
-    69:69:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1066 -> d
-    70:70:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> d
-    70:70:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> d
-    70:70:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1066 -> d
-    71:71:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1066:1066 -> d
-    72:72:void lambda$traceInvokeSuper$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1196:1196 -> d
-    73:84:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1209:1220 -> d
-    85:97:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1215:1227 -> d
-    98:98:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    98:98:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1227 -> d
-    99:100:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1229:1230 -> d
-    101:104:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1560:1560 -> d
-    105:105:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$30(com.android.tools.r8.graph.DexProgramClass):1694:1694 -> d
-    106:106:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1937:1937 -> d
-    107:107:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> d
-    107:107:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1937 -> d
-    108:108:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1938:1938 -> d
-    109:109:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1941:1941 -> d
-    109:109:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1938 -> d
-    110:122:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1986:1998 -> d
-    123:123:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    123:123:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1998 -> d
-    124:127:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2000:2003 -> d
-    128:128:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3719:3719 -> d
-    128:128:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2004 -> d
-    129:319:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):0:190 -> d
-    129:319:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3719 -> d
-    129:319:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2004 -> d
-    320:321:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):771:772 -> d
-    320:321:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3719 -> d
-    320:321:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2004 -> d
-    322:322:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2363:2363 -> d
-    323:326:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2362:2365 -> d
-    327:335:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2364:2372 -> d
-    336:336:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> d
-    336:336:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2372 -> d
-    337:338:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2373:2374 -> d
-    339:339:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    339:339:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2374 -> d
-    340:341:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2377:2378 -> d
-    342:342:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
-    342:342:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2378 -> d
-    343:352:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2381:2390 -> d
-    353:358:void ensureLambdaAccessibility():3147:3152 -> d
-    359:362:void unpinLambdaMethods():3174:3177 -> d
-    359:362:void ensureLambdaAccessibility():3169 -> d
-    363:366:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.prune(com.android.tools.r8.graph.DexReference):1889:1892 -> d
-    363:366:void unpinLambdaMethods():3177 -> d
-    363:366:void ensureLambdaAccessibility():3169 -> d
-    367:376:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3260:3269 -> d
-    377:382:java.util.SortedSet toSortedDescriptorSet(java.util.Set):3281:3286 -> d
-    383:388:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3685:3690 -> d
-    389:389:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3689:3689 -> d
-    390:390:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$78(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3687:3687 -> d
+    53:53:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1500 -> c
+    54:54:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1500:1500 -> c
+    55:55:boolean registerReflectiveFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):836:836 -> c
+    56:56:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1018:1018 -> c
+    57:57:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1117:1117 -> c
+    57:57:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1019 -> c
+    58:64:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1022:1028 -> c
+    65:65:void traceConstClassOrCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1027:1027 -> c
+    66:67:boolean registerBackportInvoke(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1213:1214 -> c
+    68:96:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1222:1250 -> c
+    97:97:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    97:97:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1250 -> c
+    98:104:com.android.tools.r8.graph.ResolutionResult$SingleResolutionResult resolveMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1853:1859 -> c
+    98:104:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1875 -> c
+    98:104:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1252 -> c
+    105:119:void handleInvokeOfStaticTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.KeepReason):1876:1890 -> c
+    105:119:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1252 -> c
+    120:120:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1253:1253 -> c
+    121:121:void lambda$traceInvokeStatic$14(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1253:1253 -> c
+    122:122:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2206:2206 -> c
+    123:123:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> c
+    123:123:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2206 -> c
+    124:129:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2206:2211 -> c
+    130:131:void transitionDependentItemsForInstantiatedInterface(com.android.tools.r8.graph.DexProgramClass):2465:2466 -> c
+    130:131:void markInterfaceAsInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):2212 -> c
+    132:132:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markFieldAsTargeted$41(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):2497:2497 -> c
+    133:137:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2602:2606 -> c
+    138:770:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:632 -> c
+    138:770:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2606 -> c
+    771:772:boolean isFieldWrittenOutsideDefaultConstructor(com.android.tools.r8.graph.ProgramField):2608:2609 -> c
+    773:774:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2628:2629 -> c
+    775:775:boolean isTypeLive(com.android.tools.r8.graph.DexProgramClass):2634:2634 -> c
+    775:775:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2629 -> c
+    776:776:boolean isTypeLive(com.android.tools.r8.graph.DexClass):2630:2630 -> c
+    777:778:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2648:2649 -> c
+    779:779:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    779:779:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2649 -> c
+    780:780:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2653:2653 -> c
+    781:784:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2652:2655 -> c
+    785:792:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2654:2661 -> c
+    793:793:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> c
+    793:793:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2661 -> c
+    794:796:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2662:2664 -> c
+    797:889:boolean com.android.tools.r8.graph.ObjectAllocationInfoCollectionImpl.isInstantiatedDirectlyOrHasInstantiatedSubtype(com.android.tools.r8.graph.DexProgramClass):0:92 -> c
+    797:889:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2663 -> c
+    890:895:void markInstanceFieldAsReachable(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2665:2670 -> c
+    896:896:com.android.tools.r8.utils.collections.ProgramFieldSet lambda$markInstanceFieldAsReachable$46(com.android.tools.r8.graph.DexProgramClass):2669:2669 -> c
+    897:901:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2799:2803 -> c
+    897:901:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2811 -> c
+    902:907:com.android.tools.r8.graph.DexMethod generatedEnumValuesMethod(com.android.tools.r8.graph.DexClass):2802:2807 -> c
+    902:907:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2811 -> c
+    908:914:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2811:2817 -> c
+    915:915:com.android.tools.r8.utils.collections.ProgramMethodSet lambda$markSuperMethodAsReachable$54(com.android.tools.r8.graph.DexEncodedMethod):2853:2853 -> c
+    916:926:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3129:3139 -> c
+    927:930:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.addInstantiatedClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,boolean):3016:3019 -> c
+    927:930:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3139 -> c
+    931:931:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3141:3141 -> c
+    932:932:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> c
+    932:932:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3142 -> c
+    933:949:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3143:3159 -> c
+    950:951:void synthesizeLambdas(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3130:3131 -> c
+    952:952:void lambda$addConsequentRootSet$71(com.android.tools.r8.graph.DexReference):3579:3579 -> c
+    953:976:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3657:3680 -> c
+    977:985:void markMethodAsKept(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3678:3686 -> c
+    986:999:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3767:3780 -> c
+    1000:1000:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> c
+    1000:1000:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3780 -> c
+    1001:1001:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
+    1001:1001:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3782 -> c
+    1002:1002:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3782:3782 -> c
+    1003:1003:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedViaSuperFrom(com.android.tools.r8.graph.ProgramMethod):41:41 -> c
+    1003:1003:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3783 -> c
+    1004:1019:void markMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):3783:3798 -> c
+    1:1:com.android.tools.r8.utils.InternalOptions access$2000(com.android.tools.r8.shaking.Enqueuer):160:160 -> d
+    2:2:com.android.tools.r8.graph.DexClass definitionForFromReflectiveAccess(com.android.tools.r8.graph.DexType):558:558 -> d
+    2:2:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType):643 -> d
+    3:3:com.android.tools.r8.graph.DexProgramClass getProgramClassOrNullFromReflectiveAccess(com.android.tools.r8.graph.DexType):644:644 -> d
+    4:4:boolean registerFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):840:840 -> d
+    4:4:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1513 -> d
+    5:24:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1517:1536 -> d
+    25:25:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    25:25:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1536 -> d
+    26:32:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1539:1545 -> d
+    33:38:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1542:1547 -> d
+    39:39:void addDeadProtoTypeCandidate(com.android.tools.r8.graph.DexProgramClass):500:500 -> d
+    39:39:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1547 -> d
+    40:43:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1552:1555 -> d
+    44:44:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.fieldReferencedIn(com.android.tools.r8.graph.ProgramMethod):61:61 -> d
+    44:44:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1558 -> d
+    45:45:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean):1558:1558 -> d
+    46:46:boolean registerReflectiveFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):844:844 -> d
+    47:47:java.util.Map lambda$traceCallSite$3(com.android.tools.r8.graph.DexEncodedMethod):909:909 -> d
+    48:48:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1126:1126 -> d
+    49:49:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1117:1117 -> d
+    49:49:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1127 -> d
+    50:56:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1131:1137 -> d
+    57:57:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> d
+    57:57:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1141 -> d
+    58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> d
+    58:58:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> d
+    58:58:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1141 -> d
+    59:59:void traceInvokeDirect(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1141:1141 -> d
+    60:60:void lambda$traceInvokeSuper$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1271:1271 -> d
+    61:72:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1284:1295 -> d
+    73:85:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1290:1302 -> d
+    86:86:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    86:86:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1302 -> d
+    87:88:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):1304:1305 -> d
+    89:90:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):1613:1614 -> d
+    91:94:void markTypeAsLive(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):1637:1637 -> d
+    95:95:java.util.Set lambda$markInterfaceTypeAsLiveViaInheritanceClause$30(com.android.tools.r8.graph.DexProgramClass):1773:1773 -> d
+    96:96:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2077:2077 -> d
+    97:97:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> d
+    97:97:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2077 -> d
+    98:98:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2078:2078 -> d
+    99:99:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.shouldNotBeMinified(com.android.tools.r8.graph.DexReference):1951:1951 -> d
+    99:99:void shouldNotBeMinified(com.android.tools.r8.graph.DexReference):2078 -> d
+    100:112:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2126:2138 -> d
+    113:113:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    113:113:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2138 -> d
+    114:117:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2140:2143 -> d
+    118:118:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3858:3858 -> d
+    118:118:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2144 -> d
+    119:309:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.reportCompatKeepMethod(com.android.tools.r8.graph.ProgramMethod):0:190 -> d
+    119:309:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3858 -> d
+    119:309:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2144 -> d
+    310:311:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):800:801 -> d
+    310:311:void markMethodAsLiveWithCompatRule(com.android.tools.r8.graph.ProgramMethod):3858 -> d
+    310:311:void markMethodAsTargeted(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2144 -> d
+    312:312:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2503:2503 -> d
+    313:316:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2502:2505 -> d
+    317:325:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2504:2512 -> d
+    326:326:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> d
+    326:326:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2512 -> d
+    327:328:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2513:2514 -> d
+    329:329:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    329:329:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2514 -> d
+    330:331:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2517:2518 -> d
+    332:332:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> d
+    332:332:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2518 -> d
+    333:342:void markStaticFieldAsLive(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):2521:2530 -> d
+    343:348:void ensureLambdaAccessibility():3287:3292 -> d
+    349:352:void unpinLambdaMethods():3314:3317 -> d
+    349:352:void ensureLambdaAccessibility():3309 -> d
+    353:356:void com.android.tools.r8.shaking.RootSetBuilder$RootSet.prune(com.android.tools.r8.graph.DexReference):1898:1901 -> d
+    353:356:void unpinLambdaMethods():3317 -> d
+    353:356:void ensureLambdaAccessibility():3309 -> d
+    357:366:void synthesizeLibraryConversionWrappers(com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions):3400:3409 -> d
+    367:371:java.util.Set toDescriptorSet(java.util.Set):3421:3425 -> d
+    372:377:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3824:3829 -> d
+    378:378:void markParameterAndReturnTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3828:3828 -> d
+    379:379:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$78(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3826:3826 -> d
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> e
-    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1105 -> e
+    1:1:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1180 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> e
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> e
-    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1105 -> e
-    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1105:1105 -> e
-    4:4:com.android.tools.r8.shaking.Enqueuer$Mode access$400(com.android.tools.r8.shaking.Enqueuer):156:156 -> e
-    5:5:com.android.tools.r8.shaking.GraphReporter getGraphReporter():419:419 -> e
-    6:6:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1051:1051 -> e
-    7:7:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1042:1042 -> e
-    7:7:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1052 -> e
-    8:8:void lambda$traceInvokeVirtual$15(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1230:1230 -> e
-    9:9:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1270:1270 -> e
-    10:10:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$27(com.android.tools.r8.graph.DexType):1653:1653 -> e
-    11:14:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2425:2428 -> e
-    15:15:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> e
-    15:15:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2429 -> e
-    16:16:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2427:2427 -> e
-    17:18:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):771:772 -> e
-    17:18:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2430 -> e
-    19:20:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2431:2432 -> e
-    21:21:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
-    21:21:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2432 -> e
-    22:22:java.util.Set lambda$markVirtualMethodAsReachable$47(com.android.tools.r8.graph.DexProgramClass):2600:2600 -> e
-    23:23:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3680:3680 -> e
-    24:26:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3679:3681 -> e
-    27:27:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$79(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3691:3691 -> e
+    2:2:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1180 -> e
+    3:3:void traceInvokeInterface(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1180:1180 -> e
+    4:4:com.android.tools.r8.shaking.Enqueuer$Mode access$400(com.android.tools.r8.shaking.Enqueuer):160:160 -> e
+    5:5:com.android.tools.r8.shaking.GraphReporter getGraphReporter():435:435 -> e
+    6:6:boolean isPinned(com.android.tools.r8.graph.DexType):579:579 -> e
+    7:7:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):0:0 -> e
+    7:7:boolean isPinned(com.android.tools.r8.graph.DexType):579 -> e
+    8:8:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):78:78 -> e
+    8:8:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139 -> e
+    8:8:boolean isPinned(com.android.tools.r8.graph.DexType):579 -> e
+    9:9:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.keepInfoForNonProgramClass():38:38 -> e
+    9:9:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):79 -> e
+    9:9:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139 -> e
+    9:9:boolean isPinned(com.android.tools.r8.graph.DexType):579 -> e
+    10:10:com.android.tools.r8.shaking.KeepClassInfo com.android.tools.r8.shaking.KeepInfoCollection.getClassInfo(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):79:79 -> e
+    10:10:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139 -> e
+    10:10:boolean isPinned(com.android.tools.r8.graph.DexType):579 -> e
+    11:11:boolean com.android.tools.r8.shaking.KeepInfoCollection.isPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexDefinitionSupplier):139:139 -> e
+    11:11:boolean isPinned(com.android.tools.r8.graph.DexType):579 -> e
+    12:23:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1034:1045 -> e
+    24:28:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1044:1048 -> e
+    29:29:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> e
+    29:29:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1052 -> e
+    30:30:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1057:1057 -> e
+    31:51:boolean com.android.tools.r8.utils.Visibility.isPrivate():0:20 -> e
+    31:51:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1060 -> e
+    52:52:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1060:1060 -> e
+    53:53:boolean com.android.tools.r8.utils.Visibility.isPublic():0:0 -> e
+    53:53:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1062 -> e
+    54:54:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1063:1063 -> e
+    55:55:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> e
+    55:55:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1067 -> e
+    56:56:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1072:1072 -> e
+    57:57:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> e
+    57:57:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1076 -> e
+    58:58:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1076:1076 -> e
+    59:59:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> e
+    59:59:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1077 -> e
+    60:60:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1077:1077 -> e
+    61:61:void lambda$traceInvokeVirtual$16(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.analysis.EnqueuerInvokeAnalysis):1305:1305 -> e
+    62:62:void traceInstanceFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1345:1345 -> e
+    63:66:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2565:2568 -> e
+    67:67:boolean com.android.tools.r8.shaking.KeepReason.isDueToReflectiveUse():0:0 -> e
+    67:67:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2569 -> e
+    68:68:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2567:2567 -> e
+    69:70:boolean enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):800:801 -> e
+    69:70:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2570 -> e
+    71:72:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2571:2572 -> e
+    73:73:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> e
+    73:73:void markVirtualMethodAsLive(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):2572 -> e
+    74:74:java.util.Set lambda$markVirtualMethodAsReachable$47(com.android.tools.r8.graph.DexProgramClass):2740:2740 -> e
+    75:75:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3819:3819 -> e
+    76:78:void markReferencedTypesAsLive(com.android.tools.r8.graph.ProgramMethod):3818:3820 -> e
+    79:79:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markParameterAndReturnTypesAsLive$79(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3830:3830 -> e
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> f
-    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1130 -> f
+    1:1:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1205 -> f
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> f
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> f
-    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1130 -> f
-    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1130:1130 -> f
-    4:4:com.android.tools.r8.shaking.GraphReporter access$500(com.android.tools.r8.shaking.Enqueuer):156:156 -> f
-    5:5:com.android.tools.r8.shaking.Enqueuer$Mode getMode():415:415 -> f
-    6:17:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):959:970 -> f
-    18:22:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):969:973 -> f
-    23:23:boolean com.android.tools.r8.utils.Visibility.isPublic():28:28 -> f
-    23:23:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):977 -> f
-    24:24:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):982:982 -> f
-    25:45:boolean com.android.tools.r8.utils.Visibility.isPrivate():0:20 -> f
-    25:45:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):985 -> f
-    46:46:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):985:985 -> f
-    47:47:boolean com.android.tools.r8.utils.Visibility.isPublic():0:0 -> f
-    47:47:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):987 -> f
-    48:48:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):988:988 -> f
-    49:49:boolean com.android.tools.r8.utils.Visibility.isProtected():24:24 -> f
-    49:49:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):992 -> f
-    50:50:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):997:997 -> f
-    51:51:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> f
-    51:51:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1001 -> f
-    52:52:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1001:1001 -> f
-    53:53:boolean com.android.tools.r8.utils.Visibility.isPackagePrivate():16:16 -> f
-    53:53:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1002 -> f
-    54:54:void traceInitClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1002:1002 -> f
-    55:55:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1274:1274 -> f
-    56:56:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$20(com.android.tools.r8.graph.DexType):1536:1536 -> f
-    57:57:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1816:1816 -> f
-    58:59:java.util.Set com.android.tools.r8.utils.SetUtils.newIdentityHashSet(java.lang.Object):16:17 -> f
-    58:59:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1817 -> f
-    60:62:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1818:1820 -> f
-    63:69:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1838:1844 -> f
-    63:69:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1822 -> f
-    70:73:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1827:1830 -> f
-    74:74:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$77(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3680:3680 -> f
-    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$600(com.android.tools.r8.shaking.Enqueuer):156:156 -> g
-    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):796:796 -> g
-    3:3:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1046:1046 -> g
-    4:4:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1042:1042 -> g
-    4:4:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1047 -> g
-    5:5:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1182:1182 -> g
-    6:6:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1492:1492 -> g
-    6:6:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1187 -> g
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> g
-    7:7:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1492 -> g
-    7:7:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1187 -> g
-    8:17:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1493:1502 -> g
-    8:17:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1187 -> g
-    18:23:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1188:1193 -> g
-    24:24:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> g
-    24:24:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1193 -> g
-    25:26:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1195:1196 -> g
-    27:27:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1320:1320 -> g
-    28:28:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$21(com.android.tools.r8.graph.DexType):1555:1555 -> g
-    29:34:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2332:2337 -> g
-    35:35:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> g
-    35:35:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2337 -> g
-    36:38:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2337:2339 -> g
-    39:41:long getNumberOfLiveItems():3390:3392 -> g
+    2:2:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1205 -> f
+    3:3:void traceInvokeStatic(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1205:1205 -> f
+    4:4:com.android.tools.r8.shaking.GraphReporter access$500(com.android.tools.r8.shaking.Enqueuer):160:160 -> f
+    5:5:com.android.tools.r8.shaking.Enqueuer$Mode getMode():431:431 -> f
+    6:6:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1121:1121 -> f
+    7:7:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1117:1117 -> f
+    7:7:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1122 -> f
+    8:8:void traceInstanceFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1349:1349 -> f
+    9:9:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$ensureMethodsContinueToWidenAccess$27(com.android.tools.r8.graph.DexType):1730:1730 -> f
+    10:21:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1895:1906 -> f
+    22:28:boolean markDirectClassInitializerAsLive(com.android.tools.r8.graph.DexProgramClass):1927:1933 -> f
+    22:28:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1910 -> f
+    29:32:void markDirectAndIndirectClassInitializersAsLive(com.android.tools.r8.graph.DexProgramClass):1916:1919 -> f
+    33:33:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$markReferencedTypesAsLive$77(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):3819:3819 -> f
+    1:1:com.android.tools.r8.shaking.EnqueuerWorklist access$600(com.android.tools.r8.shaking.Enqueuer):160:160 -> g
+    2:2:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness lambda$registerMethodWithTargetAndContext$2(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):825:825 -> g
+    3:3:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1257:1257 -> g
+    4:4:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1567:1567 -> g
+    4:4:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1262 -> g
+    5:5:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> g
+    5:5:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1567 -> g
+    5:5:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1262 -> g
+    6:15:com.android.tools.r8.graph.DexMethod getInvokeSuperTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1568:1577 -> g
+    6:15:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1262 -> g
+    16:21:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1263:1268 -> g
+    22:22:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]) -> g
+    22:22:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1268 -> g
+    23:24:void traceInvokeSuper(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1270:1271 -> g
+    25:33:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1309:1317 -> g
+    34:34:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> g
+    34:34:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1321 -> g
+    35:35:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1317:1317 -> g
+    36:36:void traceInstanceFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1395:1395 -> g
+    37:37:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$21(com.android.tools.r8.graph.DexType):1632:1632 -> g
+    38:53:void markInterfaceInitializedDirectly(com.android.tools.r8.graph.DexProgramClass):1943:1958 -> g
+    54:56:long getNumberOfLiveItems():3529:3531 -> g
     1:1:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53:53 -> h
-    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1200 -> h
+    1:1:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1275 -> h
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):49:49 -> h
     2:2:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.invokedFrom(com.android.tools.r8.graph.ProgramMethod):53 -> h
-    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1200 -> h
-    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1200:1200 -> h
-    4:4:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$700(com.android.tools.r8.shaking.Enqueuer):156:156 -> h
-    5:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():431:431 -> h
-    6:14:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1234:1242 -> h
-    15:15:com.android.tools.r8.shaking.KeepReason com.android.tools.r8.shaking.KeepReason.instantiatedIn(com.android.tools.r8.graph.ProgramMethod):33:33 -> h
-    15:15:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1246 -> h
-    16:16:void traceNewInstance(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1242:1242 -> h
-    17:17:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1324:1324 -> h
-    18:18:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$22(com.android.tools.r8.graph.DexType):1562:1562 -> h
-    19:26:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2308:2315 -> h
-    1:1:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1042:1042 -> i
-    2:2:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1371:1371 -> i
-    3:3:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$23(com.android.tools.r8.graph.DexType):1600:1600 -> i
-    4:12:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2343:2351 -> i
-    13:36:void synthesize():2940:2963 -> i
-    37:38:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):2910:2911 -> i
-    37:38:void synthesize():2963 -> i
+    2:2:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1275 -> h
+    3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):1275:1275 -> h
+    4:4:com.android.tools.r8.shaking.Enqueuer$SetWithReason access$700(com.android.tools.r8.shaking.Enqueuer):160:160 -> h
+    5:5:com.android.tools.r8.shaking.EnqueuerUseRegistryFactory getUseRegistryFactory():447:447 -> h
+    6:6:void traceTypeReference(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):1117:1117 -> h
+    7:7:void traceInstanceFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1399:1399 -> h
+    8:8:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$22(com.android.tools.r8.graph.DexType):1639:1639 -> h
+    9:26:boolean markInterfaceInitializedIndirectly(com.android.tools.r8.graph.DexProgramClass):1968:1985 -> h
+    1:1:void traceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1446:1446 -> i
+    2:2:com.android.tools.r8.shaking.ScopedDexMethodSet lambda$markTypeAsLive$23(com.android.tools.r8.graph.DexType):1677:1677 -> i
+    3:8:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2472:2477 -> i
+    9:9:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> i
+    9:9:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2477 -> i
+    10:12:void transitionDependentItemsForInstantiatedItem(com.android.tools.r8.graph.DexProgramClass):2477:2479 -> i
+    13:36:void synthesize():3080:3103 -> i
+    37:38:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):3050:3051 -> i
+    37:38:void synthesize():3103 -> i
     39:87:void com.android.tools.r8.shaking.MainDexClasses.addAll(java.lang.Iterable):0:48 -> i
-    39:87:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):2911 -> i
-    39:87:void synthesize():2963 -> i
-    88:93:void synthesize():2964:2969 -> i
-    1:1:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1375:1375 -> j
-    2:2:java.util.Set lambda$processAnnotation$31(com.android.tools.r8.graph.DexType):1750:1750 -> j
-    3:7:boolean verifyMissingTypes():3182:3186 -> j
-    1:1:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1429:1429 -> k
-    2:6:void lambda$verifyMissingTypes$64(com.android.tools.r8.graph.DexType):3188:3188 -> k
-    1:8:void recordTypeReference(com.android.tools.r8.graph.DexType):506:513 -> l
-    9:9:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1433:1433 -> l
-    1:5:void reportMissingClass(com.android.tools.r8.graph.DexType):1962:1962 -> m
-    9:12:void reportMissingClass(com.android.tools.r8.graph.DexType):1966:1969 -> m
+    39:87:void com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions.amendMainDexClasses(com.android.tools.r8.shaking.MainDexClasses):3051 -> i
+    39:87:void synthesize():3103 -> i
+    88:93:void synthesize():3104:3109 -> i
+    1:1:void traceStaticFieldReadFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1450:1450 -> j
+    2:2:java.util.Set lambda$processAnnotation$31(com.android.tools.r8.graph.DexType):1829:1829 -> j
+    3:10:void transitionFieldsForInstantiatedClass(com.android.tools.r8.graph.DexProgramClass):2448:2455 -> j
+    11:15:boolean verifyMissingTypes():3322:3326 -> j
+    1:1:void traceStaticFieldWrite(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1504:1504 -> k
+    2:10:void transitionUnusedInterfaceToLive(com.android.tools.r8.graph.DexProgramClass):2483:2491 -> k
+    11:15:void lambda$verifyMissingTypes$64(com.android.tools.r8.graph.DexType):3328:3328 -> k
+    1:4:void recordTypeReference(com.android.tools.r8.graph.DexType):522:525 -> l
+    5:5:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):554:554 -> l
+    5:5:void recordTypeReference(com.android.tools.r8.graph.DexType):529 -> l
+    6:6:void traceStaticFieldWriteFromMethodHandle(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):1508:1508 -> l
+    1:5:void reportMissingClass(com.android.tools.r8.graph.DexType):2102:2102 -> m
+    9:12:void reportMissingClass(com.android.tools.r8.graph.DexType):2106:2109 -> m
     13:13:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> m
-    13:13:void reportMissingClass(com.android.tools.r8.graph.DexType):1969 -> m
+    13:13:void reportMissingClass(com.android.tools.r8.graph.DexType):2109 -> m
 com.android.tools.r8.shaking.Enqueuer$1 -> com.android.tools.r8.shaking.q$a:
 com.android.tools.r8.shaking.Enqueuer$AnnotationReferenceMarker -> com.android.tools.r8.shaking.q$b:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.shaking.Enqueuer this$0 -> d
     com.android.tools.r8.graph.DexItem annotationHolder -> a
     com.android.tools.r8.shaking.KeepReason reason -> c
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):4184:4184 -> <init>
-    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):4191:4194 -> <init>
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason,com.android.tools.r8.shaking.Enqueuer$1):4331:4331 -> <init>
+    2:5:void <init>(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.KeepReason):4338:4341 -> <init>
     boolean addCallSite(com.android.tools.r8.graph.DexCallSite) -> a
     boolean addMethodHandle(com.android.tools.r8.graph.DexMethodHandle) -> a
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
-    1:2:boolean addField(com.android.tools.r8.graph.DexField):4204:4205 -> b
+    1:2:boolean addField(com.android.tools.r8.graph.DexField):4351:4352 -> b
     3:3:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218:218 -> b
-    3:3:boolean addField(com.android.tools.r8.graph.DexField):4209 -> b
+    3:3:boolean addField(com.android.tools.r8.graph.DexField):4356 -> b
     4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.toProgramFieldOrNull(com.android.tools.r8.graph.DexEncodedField):227:227 -> b
     4:4:com.android.tools.r8.graph.ProgramField com.android.tools.r8.graph.DexProgramClass.lookupProgramField(com.android.tools.r8.graph.DexField):218 -> b
-    4:4:boolean addField(com.android.tools.r8.graph.DexField):4209 -> b
-    5:8:boolean addField(com.android.tools.r8.graph.DexField):4214:4217 -> b
-    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> b
-    9:9:boolean addField(com.android.tools.r8.graph.DexField):4217 -> b
-    10:18:boolean addField(com.android.tools.r8.graph.DexField):4219:4227 -> b
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b
-    19:19:boolean addField(com.android.tools.r8.graph.DexField):4227 -> b
-    20:24:boolean addField(com.android.tools.r8.graph.DexField):4227:4231 -> b
-    25:31:boolean addField(com.android.tools.r8.graph.DexField):4230:4236 -> b
-    32:43:boolean addMethod(com.android.tools.r8.graph.DexMethod):4244:4255 -> b
-    44:54:boolean addMethod(com.android.tools.r8.graph.DexMethod):4253:4263 -> b
-    55:55:boolean addMethod(com.android.tools.r8.graph.DexMethod):4261:4261 -> b
-    56:57:boolean addType(com.android.tools.r8.graph.DexType):4293:4294 -> b
+    4:4:boolean addField(com.android.tools.r8.graph.DexField):4356 -> b
+    5:8:boolean addField(com.android.tools.r8.graph.DexField):4361:4364 -> b
+    9:9:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> b
+    9:9:boolean addField(com.android.tools.r8.graph.DexField):4364 -> b
+    10:18:boolean addField(com.android.tools.r8.graph.DexField):4366:4374 -> b
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> b
+    19:19:boolean addField(com.android.tools.r8.graph.DexField):4374 -> b
+    20:24:boolean addField(com.android.tools.r8.graph.DexField):4374:4378 -> b
+    25:31:boolean addField(com.android.tools.r8.graph.DexField):4377:4383 -> b
+    32:43:boolean addMethod(com.android.tools.r8.graph.DexMethod):4391:4402 -> b
+    44:54:boolean addMethod(com.android.tools.r8.graph.DexMethod):4400:4410 -> b
+    55:55:boolean addMethod(com.android.tools.r8.graph.DexMethod):4408:4408 -> b
+    56:57:boolean addType(com.android.tools.r8.graph.DexType):4440:4441 -> b
 com.android.tools.r8.shaking.Enqueuer$EnqueuerDefinitionSupplier -> com.android.tools.r8.shaking.q$c:
     com.android.tools.r8.shaking.Enqueuer enqueuer -> a
     com.android.tools.r8.graph.AppView appView -> b
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$1):4300:4300 -> <init>
-    2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):4305:4307 -> <init>
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():4317:4317 -> a
-    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):4312:4312 -> c
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.shaking.Enqueuer$1):4447:4447 -> <init>
+    2:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.Enqueuer):4452:4454 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():4464:4464 -> a
+    1:1:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):4459:4459 -> c
 com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet -> com.android.tools.r8.shaking.q$d:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set fields -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4110:4110 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4106:4111 -> <init>
-    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4104:4104 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4115:4118 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4122:4122 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4126:4126 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4122:4122 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4126 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4257:4257 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4253:4258 -> <init>
+    1:1:java.util.Set access$1400(com.android.tools.r8.shaking.Enqueuer$LiveFieldsSet):4251:4251 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):4262:4265 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedField):4269:4269 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramField):4273:4273 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedField):4269:4269 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramField):4273 -> a
 com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet -> com.android.tools.r8.shaking.q$e:
     com.android.tools.r8.shaking.Enqueuer this$0 -> c
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4136:4136 -> <init>
-    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4132:4137 -> <init>
-    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4130:4130 -> a
-    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4141:4144 -> a
-    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4148:4148 -> a
-    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4152:4152 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4148:4148 -> a
-    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4152 -> a
-    9:9:java.util.Set getItems():4156:4156 -> a
+    1:1:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4283:4283 -> <init>
+    2:7:void <init>(com.android.tools.r8.shaking.Enqueuer,java.util.function.BiConsumer):4279:4284 -> <init>
+    1:1:java.util.Set access$1300(com.android.tools.r8.shaking.Enqueuer$LiveMethodsSet):4277:4277 -> a
+    2:5:boolean add(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):4288:4291 -> a
+    6:6:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4295:4295 -> a
+    7:7:boolean contains(com.android.tools.r8.graph.ProgramMethod):4299:4299 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.DexEncodedMethod):4295:4295 -> a
+    8:8:boolean contains(com.android.tools.r8.graph.ProgramMethod):4299 -> a
+    9:9:java.util.Set getItems():4303:4303 -> a
 com.android.tools.r8.shaking.Enqueuer$Mode -> com.android.tools.r8.shaking.q$f:
     com.android.tools.r8.shaking.Enqueuer$Mode WHY_ARE_YOU_KEEPING -> d
     com.android.tools.r8.shaking.Enqueuer$Mode MAIN_DEX_TRACING -> c
     com.android.tools.r8.shaking.Enqueuer$Mode FINAL_TREE_SHAKING -> b
     com.android.tools.r8.shaking.Enqueuer$Mode INITIAL_TREE_SHAKING -> a
-    1:4:void <clinit>():159:162 -> <clinit>
-    1:1:void <init>(java.lang.String,int):158:158 -> <init>
-    1:1:boolean isFinalTreeShaking():169:169 -> a
-    1:1:boolean isInitialOrFinalTreeShaking():173:173 -> b
-    1:1:boolean isInitialTreeShaking():165:165 -> c
-    1:1:boolean isTracingMainDex():177:177 -> d
+    1:4:void <clinit>():163:166 -> <clinit>
+    1:1:void <init>(java.lang.String,int):162:162 -> <init>
+    1:1:boolean isFinalTreeShaking():173:173 -> a
+    1:1:boolean isInitialOrFinalTreeShaking():177:177 -> b
+    1:1:boolean isInitialTreeShaking():169:169 -> c
+    1:1:boolean isTracingMainDex():181:181 -> d
 com.android.tools.r8.shaking.Enqueuer$SetWithReason -> com.android.tools.r8.shaking.q$g:
     java.util.Set items -> a
     java.util.function.BiConsumer register -> b
-    1:1:void <init>(java.util.function.BiConsumer):4166:4166 -> <init>
-    2:7:void <init>(java.util.function.BiConsumer):4162:4167 -> <init>
-    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):4171:4172 -> a
-    3:3:boolean contains(java.lang.Object):4176:4176 -> a
-    4:4:java.util.Set getItems():4180:4180 -> a
+    1:1:void <init>(java.util.function.BiConsumer):4313:4313 -> <init>
+    2:7:void <init>(java.util.function.BiConsumer):4309:4314 -> <init>
+    1:2:boolean add(java.lang.Object,com.android.tools.r8.shaking.KeepReason):4318:4319 -> a
+    3:3:boolean contains(java.lang.Object):4323:4323 -> a
+    4:4:java.util.Set getItems():4327:4327 -> a
 com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason -> com.android.tools.r8.shaking.q$h:
     java.util.Map deferredActions -> c
     java.util.Set items -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():4073:4073 -> <clinit>
-    1:4:void <init>():4073:4076 -> <init>
-    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4073:4073 -> <init>
-    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4073:4073 -> a
-    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4079:4081 -> a
-    5:5:boolean contains(java.lang.Object):4088:4088 -> a
-    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4092:4093 -> a
-    8:8:java.util.Set getItems():4100:4100 -> a
-    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4093:4093 -> b
+    1:1:void <clinit>():4220:4220 -> <clinit>
+    1:4:void <init>():4220:4223 -> <init>
+    5:5:void <init>(com.android.tools.r8.shaking.Enqueuer$1):4220:4220 -> <init>
+    1:1:java.util.Set access$300(com.android.tools.r8.shaking.Enqueuer$SetWithReportedReason):4220:4220 -> a
+    2:4:boolean add(java.lang.Object,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):4226:4228 -> a
+    5:5:boolean contains(java.lang.Object):4235:4235 -> a
+    6:7:boolean registerDeferredAction(java.lang.Object,com.android.tools.r8.utils.Action):4239:4240 -> a
+    8:8:java.util.Set getItems():4247:4247 -> a
+    1:1:java.util.List lambda$registerDeferredAction$0(java.lang.Object):4240:4240 -> b
 com.android.tools.r8.shaking.Enqueuer$SyntheticAdditions -> com.android.tools.r8.shaking.q$i:
     java.util.Map syntheticInstantiations -> b
     java.util.Map liveMethods -> c
@@ -71291,18 +71760,18 @@
     java.util.List liveMethodsWithKeepActions -> e
     java.util.Set mainDexTypes -> f
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():2849:2849 -> <clinit>
-    1:15:void <init>():2849:2863 -> <init>
-    16:16:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2849:2849 -> <init>
-    1:5:boolean isEmpty():2866:2870 -> a
-    6:7:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):2884:2885 -> a
-    8:10:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):2889:2891 -> a
-    11:14:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2915:2918 -> a
+    1:1:void <clinit>():2989:2989 -> <clinit>
+    1:15:void <init>():2989:3003 -> <init>
+    16:16:void <init>(com.android.tools.r8.shaking.Enqueuer$1):2989:2989 -> <init>
+    1:5:boolean isEmpty():3006:3010 -> a
+    6:7:void addClasspathClass(com.android.tools.r8.graph.DexClasspathClass):3024:3025 -> a
+    8:10:void addLiveMethod(com.android.tools.r8.graph.ProgramMethod):3029:3031 -> a
+    11:14:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3055:3058 -> a
     15:87:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness com.android.tools.r8.shaking.GraphReporter.fakeReportShouldNotBeUsed():0:72 -> a
-    15:87:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2918 -> a
-    88:94:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2920:2926 -> a
-    95:106:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):2924:2935 -> a
-    107:107:void lambda$enqueueWorkItems$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):2921:2921 -> a
+    15:87:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3058 -> a
+    88:94:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3060:3066 -> a
+    95:106:void enqueueWorkItems(com.android.tools.r8.shaking.Enqueuer):3064:3075 -> a
+    107:107:void lambda$enqueueWorkItems$0(com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.utils.Pair):3061:3061 -> a
 com.android.tools.r8.shaking.EnqueuerFactory -> com.android.tools.r8.shaking.r:
     1:1:com.android.tools.r8.shaking.Enqueuer createForInitialTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):19:19 -> a
     2:7:com.android.tools.r8.shaking.Enqueuer createForFinalTreeShaking(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer,java.util.Set,java.util.Set):28:33 -> a
@@ -71310,9 +71779,9 @@
     9:9:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):46:46 -> a
     1:1:com.android.tools.r8.shaking.Enqueuer createForMainDexTracing(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo):39:39 -> b
     2:2:com.android.tools.r8.shaking.Enqueuer createForWhyAreYouKeeping(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.experimental.graphinfo.GraphConsumer):53:53 -> b
-com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.t9:
+com.android.tools.r8.shaking.EnqueuerMetadataTraceable -> com.android.tools.r8.internal.C9:
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.u9:
+com.android.tools.r8.shaking.EnqueuerUseRegistryFactory -> com.android.tools.r8.internal.D9:
     com.android.tools.r8.graph.UseRegistry create(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.Enqueuer) -> a
 com.android.tools.r8.shaking.EnqueuerWorklist -> com.android.tools.r8.shaking.s:
     java.util.Queue queue -> b
@@ -71326,11 +71795,11 @@
     4:4:void enqueueMarkReachableSuperAction(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):252:252 -> a
     5:5:void enqueueMarkReachableFieldAction(com.android.tools.r8.graph.ProgramField,com.android.tools.r8.shaking.KeepReason):256:256 -> a
     6:6:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266:266 -> a
-    7:7:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
+    7:7:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
     7:7:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266 -> a
     8:10:void enqueueMarkInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.InstantiationReason,com.android.tools.r8.shaking.KeepReason):266:268 -> a
     11:11:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272:272 -> a
-    12:12:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> a
+    12:12:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> a
     12:12:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272 -> a
     13:15:void enqueueMarkAnnotationInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):272:274 -> a
     16:16:void enqueueMarkMethodKeptAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):288:288 -> a
@@ -71339,7 +71808,7 @@
     19:19:void enqueueTraceStaticFieldRead(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):308:308 -> a
     1:1:com.android.tools.r8.shaking.EnqueuerWorklist$EnqueuerAction poll():244:244 -> b
     2:2:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278:278 -> b
-    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():505:505 -> b
+    3:3:boolean com.android.tools.r8.graph.DexClass.isAnnotation():523:523 -> b
     3:3:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278 -> b
     4:6:void enqueueMarkInterfaceInstantiatedAction(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness):278:280 -> b
     7:7:void enqueueMarkMethodLiveAction(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.KeepReason):284:284 -> b
@@ -71419,7 +71888,7 @@
     java.util.Map newFieldAccesses -> a
     1:2:void <init>(java.util.Map):45:46 -> <init>
     1:2:void forEachFieldAccess(com.android.tools.r8.graph.AppView,java.util.Collection,com.android.tools.r8.graph.DexField,java.util.function.BiConsumer):54:55 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     3:3:void forEachFieldAccess(com.android.tools.r8.graph.AppView,java.util.Collection,com.android.tools.r8.graph.DexField,java.util.function.BiConsumer):56 -> a
     4:5:void forEachFieldAccess(com.android.tools.r8.graph.AppView,java.util.Collection,com.android.tools.r8.graph.DexField,java.util.function.BiConsumer):56:57 -> a
     6:7:void modify(com.android.tools.r8.graph.AppView):62:63 -> a
@@ -71441,7 +71910,7 @@
     java.util.List writeContexts -> a
     1:3:void <init>():23:25 -> <init>
     1:5:void fixUpMethods(java.util.List,java.util.function.Function):28:32 -> a
-com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.Oa:
+com.android.tools.r8.shaking.FilteredClassPath -> com.android.tools.r8.internal.Xa:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.nio.file.Path path -> a
@@ -71460,7 +71929,7 @@
     1:1:boolean com.android.tools.r8.shaking.FilteredClassPath.isUnfiltered():123:123 -> toString
     1:1:java.lang.String toString():128 -> toString
     2:16:java.lang.String toString():129:143 -> toString
-com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Jb:
+com.android.tools.r8.shaking.GlobalKeepInfoConfiguration -> com.android.tools.r8.internal.Sb:
 com.android.tools.r8.shaking.GraphReporter -> com.android.tools.r8.shaking.J:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Map ruleNodes -> i
@@ -71493,60 +71962,60 @@
     62:67:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):167 -> a
     68:68:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportKeepField(com.android.tools.r8.graph.DexDefinition,java.util.Collection,com.android.tools.r8.graph.DexEncodedField):170:170 -> a
     69:69:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:174 -> a
-    70:684:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:614 -> a
-    70:684:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174 -> a
-    685:685:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:175 -> a
-    686:691:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:179 -> a
-    692:697:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):177:182 -> a
-    698:703:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):206:211 -> a
-    704:709:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):215:220 -> a
-    710:715:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):224:229 -> a
-    716:719:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):249:252 -> a
-    720:725:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):250:255 -> a
-    726:726:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263:263 -> a
-    727:727:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
-    727:727:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263 -> a
-    728:729:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):265:266 -> a
-    730:735:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):264:269 -> a
-    736:742:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):284:290 -> a
-    743:743:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
-    744:746:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):295:297 -> a
-    747:748:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):325:326 -> a
-    749:749:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
-    749:749:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329 -> a
-    750:751:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329:330 -> a
-    752:755:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):342:345 -> a
-    756:759:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):349:352 -> a
-    760:763:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):356:359 -> a
-    764:764:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386:386 -> a
-    764:764:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
-    765:765:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    765:765:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386 -> a
-    765:765:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
-    766:766:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):387:387 -> a
-    766:766:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
-    767:769:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):362:364 -> a
-    770:773:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):368:371 -> a
-    774:774:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):375:375 -> a
-    775:775:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
-    775:775:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):376 -> a
-    776:776:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):378:378 -> a
-    777:777:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):408:408 -> a
-    777:777:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):379 -> a
-    778:780:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):380:382 -> a
-    781:781:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):412:412 -> a
-    782:782:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):417:417 -> a
-    783:783:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):421:421 -> a
-    784:788:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):424:428 -> a
-    789:789:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):444:444 -> a
-    790:803:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):447:460 -> a
-    804:804:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):454:454 -> a
-    805:805:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):465:465 -> a
-    806:812:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):468:474 -> a
-    813:813:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):471:471 -> a
-    814:834:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):487:507 -> a
-    835:835:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):492:492 -> a
-    836:840:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):500:504 -> a
+    70:702:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.graph.DexClass.getDefaultInitializer():0:632 -> a
+    70:702:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174 -> a
+    703:703:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):175:175 -> a
+    704:709:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):174:179 -> a
+    710:715:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatKeepDefaultInitializer(com.android.tools.r8.graph.ProgramMethod):177:182 -> a
+    716:721:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):206:211 -> a
+    722:727:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):215:220 -> a
+    728:733:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportClassReferencedFrom(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramField):224:229 -> a
+    734:737:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):249:252 -> a
+    738:743:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportReachableMethodAsLive(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):250:255 -> a
+    744:744:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263:263 -> a
+    745:745:boolean com.android.tools.r8.shaking.InstantiatedObject.isClass():0:0 -> a
+    745:745:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):263 -> a
+    746:747:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):265:266 -> a
+    748:753:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportLibraryMethodAsLive(com.android.tools.r8.shaking.InstantiatedObject,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexClass):264:269 -> a
+    754:760:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):284:290 -> a
+    761:761:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):288:288 -> a
+    762:764:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):295:297 -> a
+    765:766:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):325:326 -> a
+    767:767:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
+    767:767:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329 -> a
+    768:769:boolean skipReporting(com.android.tools.r8.shaking.KeepReason):329:330 -> a
+    770:773:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):342:345 -> a
+    774:777:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerAnnotation(com.android.tools.r8.graph.DexAnnotation,com.android.tools.r8.shaking.KeepReason):349:352 -> a
+    778:781:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):356:359 -> a
+    782:782:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386:386 -> a
+    782:782:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
+    783:783:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    783:783:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):386 -> a
+    783:783:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
+    784:784:boolean isNonProgramClass(com.android.tools.r8.graph.DexType):387:387 -> a
+    784:784:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):359 -> a
+    785:787:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason):362:364 -> a
+    788:791:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerField(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.shaking.KeepReason):368:371 -> a
+    792:792:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):375:375 -> a
+    793:793:com.android.tools.r8.experimental.graphinfo.GraphNode getSourceNode(com.android.tools.r8.shaking.KeepReason):391:391 -> a
+    793:793:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):376 -> a
+    794:794:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):378:378 -> a
+    795:795:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.shaking.KeepReason):408:408 -> a
+    795:795:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):379 -> a
+    796:798:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness registerEdge(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.KeepReason):380:382 -> a
+    799:799:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo getEdgeInfo(com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind):412:412 -> a
+    800:800:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):417:417 -> a
+    801:801:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode getAnnotationGraphNode(com.android.tools.r8.graph.DexItem):421:421 -> a
+    802:806:com.android.tools.r8.experimental.graphinfo.AnnotationGraphNode lambda$getAnnotationGraphNode$1(com.android.tools.r8.graph.DexItem,com.android.tools.r8.graph.DexItem):424:428 -> a
+    807:807:com.android.tools.r8.experimental.graphinfo.MethodGraphNode getMethodGraphNode(com.android.tools.r8.graph.DexMethod):444:444 -> a
+    808:821:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):447:460 -> a
+    822:822:com.android.tools.r8.experimental.graphinfo.MethodGraphNode lambda$getMethodGraphNode$3(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):454:454 -> a
+    823:823:com.android.tools.r8.experimental.graphinfo.FieldGraphNode getFieldGraphNode(com.android.tools.r8.graph.DexField):465:465 -> a
+    824:830:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):468:474 -> a
+    831:831:com.android.tools.r8.experimental.graphinfo.FieldGraphNode lambda$getFieldGraphNode$4(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):471:471 -> a
+    832:852:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode getKeepRuleGraphNode(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):487:507 -> a
+    853:853:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$5(com.android.tools.r8.shaking.ProguardKeepRuleBase,java.util.Set,com.android.tools.r8.shaking.ProguardKeepRuleBase):492:492 -> a
+    854:858:com.android.tools.r8.experimental.graphinfo.KeepRuleGraphNode lambda$getKeepRuleGraphNode$6(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.ProguardKeepRuleBase):500:504 -> a
     1:4:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):195:198 -> b
     5:10:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompatInstantiated(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):196:201 -> b
     11:17:com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness reportCompanionClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):273:279 -> b
@@ -71585,35 +72054,35 @@
     1:1:void <clinit>():37:37 -> <clinit>
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer,java.util.concurrent.ExecutorService,java.util.Map,com.android.tools.r8.shaking.ConsequentRootSetBuilder):53:53 -> <init>
     2:18:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,com.android.tools.r8.shaking.Enqueuer,java.util.concurrent.ExecutorService,java.util.Map,com.android.tools.r8.shaking.ConsequentRootSetBuilder):43:59 -> <init>
-    1:775:boolean com.android.tools.r8.shaking.RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):0:774 -> a
-    1:775:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):197 -> a
-    776:789:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):200:213 -> a
-    790:806:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():63:79 -> a
-    807:842:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():78:113 -> a
-    843:843:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    843:843:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114 -> a
-    844:878:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114:148 -> a
-    879:879:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():146:146 -> a
-    880:885:boolean lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,com.android.tools.r8.shaking.ProguardIfRule):96:101 -> a
-    886:892:boolean lambda$run$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,com.android.tools.r8.shaking.ProguardIfRule):127:133 -> a
-    893:893:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:154 -> a
-    894:897:boolean com.android.tools.r8.com.google.common.collect.Iterables.isEmpty(java.lang.Iterable):1023:1026 -> a
-    894:897:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154 -> a
-    898:899:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:155 -> a
-    900:909:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):179:188 -> a
-    910:911:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):220:221 -> a
-    912:912:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
-    912:912:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222 -> a
-    913:920:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222:229 -> a
-    921:934:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:240 -> a
-    935:964:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):238:267 -> a
-    965:965:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():528:528 -> a
-    965:965:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273 -> a
-    966:967:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273:274 -> a
-    968:971:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):233:236 -> a
-    972:975:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):242:245 -> a
-    976:977:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):269:270 -> a
-    978:1010:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):283:315 -> a
+    1:778:boolean com.android.tools.r8.shaking.RootSetBuilder.satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):0:777 -> a
+    1:778:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):197 -> a
+    779:792:boolean evaluateClassForIfRule(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexProgramClass):200:213 -> a
+    793:809:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():63:79 -> a
+    810:845:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():78:113 -> a
+    846:846:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    846:846:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114 -> a
+    847:881:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():114:148 -> a
+    882:882:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet run():146:146 -> a
+    883:888:boolean lambda$run$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,com.android.tools.r8.shaking.ProguardIfRule):96:101 -> a
+    889:895:boolean lambda$run$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData,com.android.tools.r8.shaking.ProguardIfRule):127:133 -> a
+    896:896:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:154 -> a
+    897:900:boolean com.android.tools.r8.com.google.common.collect.Iterables.isEmpty(java.lang.Iterable):1023:1026 -> a
+    897:900:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154 -> a
+    901:902:boolean canRemoveSubsequentKeepRule(com.android.tools.r8.shaking.ProguardIfRule):154:155 -> a
+    903:912:boolean isEffectivelyLive(com.android.tools.r8.graph.DexProgramClass):179:188 -> a
+    913:914:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):220:221 -> a
+    915:915:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():546:546 -> a
+    915:915:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222 -> a
+    916:923:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):222:229 -> a
+    924:937:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):227:240 -> a
+    938:967:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):238:267 -> a
+    968:968:com.android.tools.r8.graph.DexReference com.android.tools.r8.graph.DexClass.getReference():546:546 -> a
+    968:968:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273 -> a
+    969:970:boolean evaluateIfRuleMembersAndMaterialize(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):273:274 -> a
+    971:974:boolean lambda$evaluateIfRuleMembersAndMaterialize$2(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):233:236 -> a
+    975:978:boolean lambda$evaluateIfRuleMembersAndMaterialize$3(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):242:245 -> a
+    979:980:boolean lambda$evaluateIfRuleMembersAndMaterialize$4(java.util.Collection,java.util.Collection,com.android.tools.r8.shaking.ProguardMemberRule):269:270 -> a
+    981:1013:void materializeIfRule(com.android.tools.r8.shaking.ProguardIfRule,java.util.Set):283:315 -> a
     1:5:void registerClassCapture(com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):167:171 -> b
 com.android.tools.r8.shaking.InlineRule -> com.android.tools.r8.shaking.O:
     com.android.tools.r8.origin.Origin checkDiscardOrigin -> q
@@ -71675,7 +72144,7 @@
     com.android.tools.r8.ir.desugar.LambdaDescriptor lambdaDescriptor -> a
     1:2:void <init>(com.android.tools.r8.ir.desugar.LambdaDescriptor):57:58 -> <init>
     1:1:com.android.tools.r8.ir.desugar.LambdaDescriptor asLambda():68:68 -> b
-com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.ce:
+com.android.tools.r8.shaking.InstantiationReason -> com.android.tools.r8.internal.qe:
     com.android.tools.r8.shaking.InstantiationReason REFERENCED_IN_METHOD_HANDLE -> d
     com.android.tools.r8.shaking.InstantiationReason REFLECTION -> e
     com.android.tools.r8.shaking.InstantiationReason LAMBDA -> b
@@ -71776,7 +72245,7 @@
     6:9:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):29:32 -> <init>
     10:10:void <init>(com.android.tools.r8.shaking.KeepInfo$Builder):28:28 -> <init>
     1:1:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77:77 -> a
-    2:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():578:579 -> a
+    2:3:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():579:580 -> a
     2:3:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77 -> a
     4:4:boolean internalIsAccessModificationAllowed():82:82 -> a
     4:4:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):77 -> a
@@ -71791,10 +72260,10 @@
     2:2:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):87:87 -> b
     3:3:boolean isPinned():39:39 -> b
     3:3:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):88 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():560:560 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():561:561 -> b
     4:4:boolean isAllowSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):88 -> b
     1:1:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49:49 -> c
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> c
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> c
     2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49 -> c
     3:3:boolean internalIsMinificationAllowed():53:53 -> c
     3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):49 -> c
@@ -72119,7 +72588,7 @@
     1:1:void <init>(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.KeepReason$1):142:142 -> <init>
     2:2:void <init>(com.android.tools.r8.graph.DexEncodedMethod):145:145 -> <init>
     1:1:com.android.tools.r8.experimental.graphinfo.GraphEdgeInfo$EdgeKind edgeKind():150:150 -> a
-com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.il:
+com.android.tools.r8.shaking.L8TreePruner -> com.android.tools.r8.internal.vl:
     java.util.List pruned -> c
     java.util.Set emulatedInterfaces -> a
     java.util.Set backports -> b
@@ -72131,7 +72600,7 @@
     9:21:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):48 -> a
     22:22:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):51:51 -> a
     23:31:com.android.tools.r8.graph.DexApplication prune(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.ir.desugar.PrefixRewritingMapper):49:57 -> a
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.im:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis -> com.android.tools.r8.internal.vm:
     com.android.tools.r8.graph.AppView appView -> b
     java.util.Set nonEscapingClassesWithLibraryMethodOverrides -> c
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2IntMap escapeDebuggingCounters -> d
@@ -72150,7 +72619,7 @@
     11:15:void lambda$getClassesWithLibraryMethodOverrides$0(java.util.Set,com.android.tools.r8.graph.DexProgramClass):68 -> a
     16:16:void lambda$getClassesWithLibraryMethodOverrides$0(java.util.Set,com.android.tools.r8.graph.DexProgramClass):70:70 -> a
     17:29:void analyze(com.android.tools.r8.ir.code.IRCode):108:120 -> a
-    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    30:30:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     30:30:void analyze(com.android.tools.r8.ir.code.IRCode):120 -> a
     31:46:void analyze(com.android.tools.r8.ir.code.IRCode):121:136 -> a
     47:47:void analyze(com.android.tools.r8.ir.code.IRCode):135:135 -> a
@@ -72167,7 +72636,7 @@
     8:12:void logResults():162:166 -> b
     13:20:void logResults():163:170 -> b
     21:27:void logResults():167:173 -> b
-com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.hm:
+com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration -> com.android.tools.r8.internal.um:
     com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration INSTANCE -> a
     1:1:void <clinit>():184:184 -> <clinit>
     1:1:void <init>():187:187 -> <init>
@@ -72175,9 +72644,9 @@
     2:4:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):199:201 -> a
     5:27:boolean com.android.tools.r8.shaking.LibraryMethodOverrideAnalysis$LibraryEscapeAnalysisConfiguration.isLegitimateConstructorInvocation(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):211:233 -> a
     5:27:boolean isLegitimateEscapeRoute(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.escape.EscapeAnalysis,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.graph.ProgramMethod):200 -> a
-com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.lm:
+com.android.tools.r8.shaking.LibraryModeledPredicate -> com.android.tools.r8.internal.ym:
     boolean isModeled(com.android.tools.r8.graph.DexType) -> d
-com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.internal.rn:
+com.android.tools.r8.shaking.MainDexClasses -> com.android.tools.r8.internal.Dn:
     java.util.Set mainDexClasses -> a
     1:1:void <init>(java.util.Set,com.android.tools.r8.shaking.MainDexClasses$1):14:14 -> <init>
     2:3:void <init>(java.util.Set):22:23 -> <init>
@@ -72196,15 +72665,15 @@
     4:4:boolean contains(com.android.tools.r8.graph.DexProgramClass):57 -> b
     1:1:boolean isEmpty():74:74 -> c
     1:1:int size():87:87 -> d
-com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.internal.rn$a:
-com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.internal.rn$b:
+com.android.tools.r8.shaking.MainDexClasses$1 -> com.android.tools.r8.internal.Dn$a:
+com.android.tools.r8.shaking.MainDexClasses$Builder -> com.android.tools.r8.internal.Dn$b:
     java.util.Set mainDexClasses -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexClasses$1):100:100 -> <init>
     2:2:void <init>():104:104 -> <init>
     3:3:void <init>():102:102 -> <init>
     1:1:void add(com.android.tools.r8.graph.DexProgramClass):107:107 -> a
     2:2:com.android.tools.r8.shaking.MainDexClasses build():111:111 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.vn:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer -> com.android.tools.r8.internal.Hn:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector annotationDirectReferenceCollector -> b
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector codeDirectReferenceCollector -> c
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> d
@@ -72231,8 +72700,8 @@
     24:24:boolean hasReferencesOutsideFromCode(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.ProgramMethod,java.util.Set):87:87 -> a
     25:29:void lambda$hasReferencesOutsideFromCode$3(com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Set,com.android.tools.r8.utils.BooleanBox,com.android.tools.r8.graph.DexType):77:81 -> a
     30:33:void traceMethodDirectDependencies(com.android.tools.r8.graph.DexMethod,java.util.function.Consumer):95:98 -> a
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.sn:
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.tn:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1 -> com.android.tools.r8.internal.En:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$AnnotationDirectReferenceCollector -> com.android.tools.r8.internal.Fn:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> a
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer):184:184 -> <init>
     2:2:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):184:184 -> <init>
@@ -72243,27 +72712,27 @@
     1:2:boolean addField(com.android.tools.r8.graph.DexField):194:195 -> b
     3:4:boolean addMethod(com.android.tools.r8.graph.DexMethod):201:202 -> b
     5:5:boolean addType(com.android.tools.r8.graph.DexType):222:222 -> b
-com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.un:
+com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector -> com.android.tools.r8.internal.Gn:
     com.android.tools.r8.shaking.MainDexDirectReferenceTracer this$0 -> c
     1:1:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.shaking.MainDexDirectReferenceTracer$1):102:102 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.MainDexDirectReferenceTracer,com.android.tools.r8.graph.DexItemFactory):104:105 -> <init>
     1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):120:120 -> a
     2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):150:150 -> a
     1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):130:130 -> b
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):125:125 -> c
-    2:2:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):145:145 -> c
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):110:110 -> d
-    2:2:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):135:135 -> d
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):110:110 -> c
+    2:2:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):125:125 -> c
+    3:3:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):145:145 -> c
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):135:135 -> d
+    2:2:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector.registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> d
+    2:2:void registerInstanceOf(com.android.tools.r8.graph.DexType):180 -> d
     1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):115:115 -> e
     2:2:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):155:155 -> e
-    3:3:void com.android.tools.r8.shaking.MainDexDirectReferenceTracer$DirectReferencesCollector.registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> e
-    3:3:void registerInstanceOf(com.android.tools.r8.graph.DexType):180 -> e
+    3:3:void registerNewInstance(com.android.tools.r8.graph.DexType):170:170 -> e
     1:2:void registerInvoke(com.android.tools.r8.graph.DexMethod):139:140 -> f
-    3:3:void registerNewInstance(com.android.tools.r8.graph.DexType):170:170 -> f
+    3:3:void registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> f
     1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):160:160 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):175:175 -> g
     1:2:void registerFieldAccess(com.android.tools.r8.graph.DexField):164:165 -> i
-com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.wn:
+com.android.tools.r8.shaking.MainDexListBuilder -> com.android.tools.r8.internal.In:
     java.util.Map annotationTypeContainEnum -> d
     com.android.tools.r8.graph.AppView appView -> c
     com.android.tools.r8.shaking.MainDexTracingResult$Builder mainDexClassesBuilder -> e
@@ -72284,7 +72753,7 @@
     18:18:void com.android.tools.r8.shaking.MainDexListBuilder.addClassAnnotatedWithAnnotationWithEnum(com.android.tools.r8.graph.DexType):156:156 -> a
     18:18:void lambda$traceRuntimeAnnotationsWithEnumForMainDex$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexAnnotation):88 -> a
     19:25:void addDirectDependency(com.android.tools.r8.graph.DexType):161:167 -> a
-    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    26:26:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     26:26:void addDirectDependency(com.android.tools.r8.graph.DexType):167 -> a
     27:30:void addDirectDependency(com.android.tools.r8.graph.DexType):169:172 -> a
     31:33:void addDirectDependency(com.android.tools.r8.graph.DexProgramClass):176:178 -> a
@@ -72300,7 +72769,7 @@
     4:60:com.android.tools.r8.shaking.MainDexTracingResult com.android.tools.r8.shaking.MainDexTracingResult$Builder.build():0:56 -> b
     4:60:com.android.tools.r8.shaking.MainDexTracingResult run():68 -> b
     61:63:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):95:97 -> b
-    64:64:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
+    64:64:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
     64:64:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):97 -> b
     65:76:boolean isAnnotationWithEnum(com.android.tools.r8.graph.DexType):100:111 -> b
     77:77:boolean com.android.tools.r8.shaking.MainDexListBuilder.isAnnotation(com.android.tools.r8.graph.DexType):132:132 -> b
@@ -72315,9 +72784,9 @@
     6:13:void com.android.tools.r8.shaking.MainDexListBuilder.addAnnotationsWithEnum(com.android.tools.r8.graph.DexProgramClass):141:148 -> d
     6:13:void traceRuntimeAnnotationsWithEnumForMainDex():78 -> d
     14:14:void traceRuntimeAnnotationsWithEnumForMainDex():83:83 -> d
-    15:21:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):229:235 -> d
+    15:21:void com.android.tools.r8.graph.DexClass.forEachAnnotation(java.util.function.Consumer):239:245 -> d
     15:21:void traceRuntimeAnnotationsWithEnumForMainDex():83 -> d
-com.android.tools.r8.shaking.MainDexTracingResult -> com.android.tools.r8.internal.yn:
+com.android.tools.r8.shaking.MainDexTracingResult -> com.android.tools.r8.internal.Kn:
     java.util.Set roots -> c
     java.util.Set dependencies -> d
     java.util.Set classes -> e
@@ -72326,29 +72795,51 @@
     1:4:void <clinit>():19:22 -> <clinit>
     1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexTracingResult$1):19:19 -> <init>
     2:6:void <init>(java.util.Set,java.util.Set):72:76 -> <init>
-    1:1:java.util.Set getClasses():93:93 -> a
-    2:2:boolean contains(com.android.tools.r8.graph.DexProgramClass):97:97 -> a
-    3:3:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getClasses():93:93 -> a
-    3:3:boolean com.android.tools.r8.shaking.MainDexTracingResult.contains(com.android.tools.r8.graph.DexType):101 -> a
-    3:3:boolean contains(com.android.tools.r8.graph.DexProgramClass):97 -> a
-    4:4:boolean com.android.tools.r8.shaking.MainDexTracingResult.contains(com.android.tools.r8.graph.DexType):101:101 -> a
-    4:4:boolean contains(com.android.tools.r8.graph.DexProgramClass):97 -> a
-    5:5:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):106:106 -> a
-    6:7:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):108:109 -> a
-    8:8:com.android.tools.r8.shaking.MainDexTracingResult$Builder builder(com.android.tools.r8.graph.AppInfo):123:123 -> a
-    9:9:com.android.tools.r8.shaking.MainDexTracingResult$Builder com.android.tools.r8.shaking.MainDexTracingResult.builder(com.android.tools.r8.graph.AppInfo):123:123 -> a
-    9:9:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):115 -> a
-    10:12:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):116:118 -> a
-    13:13:com.android.tools.r8.shaking.MainDexTracingResult com.android.tools.r8.shaking.MainDexTracingResult$Builder.build():56:56 -> a
-    13:13:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):119 -> a
-    14:14:void com.android.tools.r8.shaking.MainDexTracingResult.<init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexTracingResult$1):19:19 -> a
-    14:14:com.android.tools.r8.shaking.MainDexTracingResult com.android.tools.r8.shaking.MainDexTracingResult$Builder.build():56 -> a
-    14:14:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):119 -> a
-    1:1:java.util.Set getDependencies():89:89 -> b
-    1:1:java.util.Set getRoots():85:85 -> c
-    1:2:boolean isEmpty():80:81 -> d
-com.android.tools.r8.shaking.MainDexTracingResult$1 -> com.android.tools.r8.internal.yn$a:
-com.android.tools.r8.shaking.MainDexTracingResult$Builder -> com.android.tools.r8.internal.yn$b:
+    1:1:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getRoots():96:96 -> a
+    1:1:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126 -> a
+    1:1:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):83 -> a
+    2:2:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126:126 -> a
+    2:2:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):83 -> a
+    3:3:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexClassAndMember.getContextType():27:27 -> a
+    3:3:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126 -> a
+    3:3:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):83 -> a
+    4:4:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126:126 -> a
+    4:4:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):83 -> a
+    5:5:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getRoots():96:96 -> a
+    5:5:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126 -> a
+    5:5:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):87 -> a
+    6:6:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126:126 -> a
+    6:6:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):87 -> a
+    7:7:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():561:561 -> a
+    7:7:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126 -> a
+    7:7:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):87 -> a
+    8:8:boolean com.android.tools.r8.shaking.MainDexTracingResult.isRoot(com.android.tools.r8.graph.ProgramDefinition):126:126 -> a
+    8:8:boolean canReferenceItemFromContextWithoutIncreasingMainDexSize(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.ProgramDefinition):87 -> a
+    9:9:java.util.Set getClasses():104:104 -> a
+    10:10:boolean contains(com.android.tools.r8.graph.ProgramDefinition):108:108 -> a
+    11:11:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.DexProgramClass.getContextType():561:561 -> a
+    11:11:boolean contains(com.android.tools.r8.graph.ProgramDefinition):108 -> a
+    12:12:java.util.Set com.android.tools.r8.shaking.MainDexTracingResult.getClasses():104:104 -> a
+    12:12:boolean com.android.tools.r8.shaking.MainDexTracingResult.contains(com.android.tools.r8.graph.DexType):112 -> a
+    12:12:boolean contains(com.android.tools.r8.graph.ProgramDefinition):108 -> a
+    13:13:boolean com.android.tools.r8.shaking.MainDexTracingResult.contains(com.android.tools.r8.graph.DexType):112:112 -> a
+    13:13:boolean contains(com.android.tools.r8.graph.ProgramDefinition):108 -> a
+    14:14:void collectTypesMatching(java.util.Set,java.util.function.Predicate,java.util.function.Consumer):117:117 -> a
+    15:16:void lambda$collectTypesMatching$0(java.util.function.Predicate,java.util.function.Consumer,com.android.tools.r8.graph.DexType):119:120 -> a
+    17:17:com.android.tools.r8.shaking.MainDexTracingResult$Builder builder(com.android.tools.r8.graph.AppInfo):142:142 -> a
+    18:18:com.android.tools.r8.shaking.MainDexTracingResult$Builder com.android.tools.r8.shaking.MainDexTracingResult.builder(com.android.tools.r8.graph.AppInfo):142:142 -> a
+    18:18:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):134 -> a
+    19:21:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):135:137 -> a
+    22:22:com.android.tools.r8.shaking.MainDexTracingResult com.android.tools.r8.shaking.MainDexTracingResult$Builder.build():56:56 -> a
+    22:22:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):138 -> a
+    23:23:void com.android.tools.r8.shaking.MainDexTracingResult.<init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.MainDexTracingResult$1):19:19 -> a
+    23:23:com.android.tools.r8.shaking.MainDexTracingResult com.android.tools.r8.shaking.MainDexTracingResult$Builder.build():56 -> a
+    23:23:com.android.tools.r8.shaking.MainDexTracingResult prunedCopy(com.android.tools.r8.shaking.AppInfoWithLiveness):138 -> a
+    1:1:java.util.Set getDependencies():100:100 -> b
+    1:1:java.util.Set getRoots():96:96 -> c
+    1:2:boolean isEmpty():91:92 -> d
+com.android.tools.r8.shaking.MainDexTracingResult$1 -> com.android.tools.r8.internal.Kn$a:
+com.android.tools.r8.shaking.MainDexTracingResult$Builder -> com.android.tools.r8.internal.Kn$b:
     java.util.Set roots -> c
     java.util.Set dependencies -> d
     boolean $assertionsDisabled -> a
@@ -72408,17 +72899,27 @@
     1:1:void <init>(com.android.tools.r8.shaking.NoStaticClassMergingRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.NoVerticalClassMergingRule -> com.android.tools.r8.shaking.E0:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule -> com.android.tools.r8.shaking.E0:
+    int $r8$clinit -> q
+    1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$1):10:10 -> <init>
+    2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):59:59 -> <init>
+    java.lang.String typeString() -> A
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$1 -> com.android.tools.r8.shaking.C0:
+com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder -> com.android.tools.r8.shaking.D0:
+    1:1:void <init>(com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$1):14:14 -> <init>
+    2:2:void <init>():18:18 -> <init>
+    com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
+com.android.tools.r8.shaking.NoVerticalClassMergingRule -> com.android.tools.r8.shaking.H0:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.NoVerticalClassMergingRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):59:59 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.NoVerticalClassMergingRule$1 -> com.android.tools.r8.shaking.C0:
-com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.D0:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule$1 -> com.android.tools.r8.shaking.F0:
+com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder -> com.android.tools.r8.shaking.G0:
     1:1:void <init>(com.android.tools.r8.shaking.NoVerticalClassMergingRule$1):14:14 -> <init>
     2:2:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.ot:
+com.android.tools.r8.shaking.ProguardAccessFlags -> com.android.tools.r8.internal.Jt:
     java.util.List NAMES -> b
     int flags -> c
     int PPP_MASK -> a
@@ -72469,50 +72970,50 @@
     1:1:void setSynchronized():158:158 -> x
     1:1:void setSynthetic():182:182 -> y
     1:1:void setTransient():150:150 -> z
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.H0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule -> com.android.tools.r8.shaking.K0:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.shaking.F0:
-com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.G0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1 -> com.android.tools.r8.shaking.I0:
+com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder -> com.android.tools.r8.shaking.J0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.I0:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule -> com.android.tools.r8.shaking.L0:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> A
     boolean applyToNonProgramClasses() -> p
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.shaking.I0$a:
-com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.I0$b:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1 -> com.android.tools.r8.shaking.L0$a:
+com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder -> com.android.tools.r8.shaking.L0$b:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
     1:11:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule build():26:36 -> e
-com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.shaking.L0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule -> com.android.tools.r8.shaking.O0:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.shaking.J0:
-com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.K0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$1 -> com.android.tools.r8.shaking.M0:
+com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder -> com.android.tools.r8.shaking.N0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardAssumeValuesRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.O0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule -> com.android.tools.r8.shaking.R0:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.shaking.M0:
-com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.N0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$1 -> com.android.tools.r8.shaking.P0:
+com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder -> com.android.tools.r8.shaking.Q0:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardCheckDiscardRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
     1:11:com.android.tools.r8.shaking.ProguardCheckDiscardRule build():26:36 -> e
-com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.P0:
+com.android.tools.r8.shaking.ProguardClassFilter -> com.android.tools.r8.shaking.S0:
     com.android.tools.r8.shaking.ProguardClassFilter EMPTY -> a
     boolean $assertionsDisabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> c
@@ -72525,15 +73026,15 @@
     6:10:void lambda$filterOutMatches$0(java.util.Set,com.android.tools.r8.shaking.ProguardTypeMatcher):61:65 -> a
     1:1:com.android.tools.r8.shaking.ProguardClassFilter empty():42:42 -> b
     1:1:boolean isEmpty():46:46 -> c
-com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.shaking.P0$a:
-com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.P0$b:
+com.android.tools.r8.shaking.ProguardClassFilter$1 -> com.android.tools.r8.shaking.S0$a:
+com.android.tools.r8.shaking.ProguardClassFilter$Builder -> com.android.tools.r8.shaking.S0$b:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassFilter$1):21:21 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():22:22 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassFilter$Builder addPattern(com.android.tools.r8.shaking.ProguardClassNameList):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardClassFilter build():33:33 -> a
-com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.shaking.Q0:
+com.android.tools.r8.shaking.ProguardClassNameList -> com.android.tools.r8.shaking.T0:
     1:1:void <init>():21:21 -> <init>
     java.util.List asSpecificDexTypes() -> a
     void forEachTypeMatcher(java.util.function.Consumer) -> a
@@ -72546,15 +73047,15 @@
     1:1:java.lang.Iterable getWildcards():87:87 -> c
     int size() -> d
     1:3:java.lang.String toString():71:73 -> toString
-com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.shaking.Q0$a:
-com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.Q0$b:
+com.android.tools.r8.shaking.ProguardClassNameList$1 -> com.android.tools.r8.shaking.T0$a:
+com.android.tools.r8.shaking.ProguardClassNameList$Builder -> com.android.tools.r8.shaking.T0$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardClassNameList$1):37:37 -> <init>
     2:2:void <init>():44:44 -> <init>
     3:3:void <init>():42:42 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardClassNameList$Builder addClassName(boolean,com.android.tools.r8.shaking.ProguardTypeMatcher):48:48 -> a
     2:9:com.android.tools.r8.shaking.ProguardClassNameList build():53:60 -> a
-com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.Q0$c:
+com.android.tools.r8.shaking.ProguardClassNameList$MixedClassNameList -> com.android.tools.r8.shaking.T0$c:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap classNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardClassNameList$1):283:283 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):287:288 -> <init>
@@ -72570,7 +73071,7 @@
     1:1:int size():293:293 -> d
     1:5:boolean equals(java.lang.Object):316:320 -> equals
     1:1:int hashCode():325:325 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.Q0$d:
+com.android.tools.r8.shaking.ProguardClassNameList$PositiveClassNameList -> com.android.tools.r8.shaking.T0$d:
     com.android.tools.r8.com.google.common.collect.ImmutableList classNames -> a
     1:1:void <init>(java.util.Collection,com.android.tools.r8.shaking.ProguardClassNameList$1):205:205 -> <init>
     2:3:void <init>(java.util.Collection):209:210 -> <init>
@@ -72588,7 +73089,7 @@
     1:1:int size():215:215 -> d
     1:5:boolean equals(java.lang.Object):235:239 -> equals
     1:1:int hashCode():244:244 -> hashCode
-com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.Q0$e:
+com.android.tools.r8.shaking.ProguardClassNameList$SingleClassNameList -> com.android.tools.r8.shaking.T0$e:
     com.android.tools.r8.shaking.ProguardTypeMatcher className -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.shaking.ProguardClassNameList$1):143:143 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher):147:148 -> <init>
@@ -72602,7 +73103,7 @@
     int size() -> d
     1:5:boolean equals(java.lang.Object):166:170 -> equals
     1:1:int hashCode():175:175 -> hashCode
-com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.R0:
+com.android.tools.r8.shaking.ProguardClassSpecification -> com.android.tools.r8.shaking.U0:
     com.android.tools.r8.shaking.ProguardClassType classType -> i
     boolean inheritanceIsExtends -> m
     com.android.tools.r8.shaking.ProguardTypeMatcher inheritanceClassName -> l
@@ -72641,7 +73142,7 @@
     1:1:java.lang.String getSource():245:245 -> n
     1:1:boolean hasInheritanceClassName():261:261 -> o
     1:1:java.lang.String toString():402:402 -> toString
-com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.shaking.R0$a:
+com.android.tools.r8.shaking.ProguardClassSpecification$Builder -> com.android.tools.r8.shaking.U0$a:
     com.android.tools.r8.shaking.ProguardClassType classType -> j
     boolean inheritanceIsExtends -> n
     java.util.List memberRules -> o
@@ -72671,7 +73172,7 @@
     1:7:com.android.tools.r8.position.Position getPosition():73:79 -> c
     8:9:com.android.tools.r8.shaking.ProguardClassSpecification$Builder setMemberRules(java.util.List):87:88 -> c
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.pt:
+com.android.tools.r8.shaking.ProguardClassType -> com.android.tools.r8.internal.Kt:
     com.android.tools.r8.shaking.ProguardClassType ANNOTATION_INTERFACE -> a
     com.android.tools.r8.shaking.ProguardClassType CLASS -> b
     com.android.tools.r8.shaking.ProguardClassType UNSPECIFIED -> e
@@ -72684,22 +73185,22 @@
     2:2:void <init>(java.lang.String,int,com.android.tools.r8.shaking.ProguardClassType$1):9:9 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
     1:9:java.lang.String toString():43:51 -> toString
-com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.pt$a:
+com.android.tools.r8.shaking.ProguardClassType$1 -> com.android.tools.r8.internal.Kt$a:
     1:1:void <init>(java.lang.String,int):10:10 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):13:13 -> a
-com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.pt$b:
+com.android.tools.r8.shaking.ProguardClassType$2 -> com.android.tools.r8.internal.Kt$b:
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.pt$c:
+com.android.tools.r8.shaking.ProguardClassType$3 -> com.android.tools.r8.internal.Kt$c:
     1:1:void <init>(java.lang.String,int):22:22 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):25:25 -> a
-com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.pt$d:
+com.android.tools.r8.shaking.ProguardClassType$4 -> com.android.tools.r8.internal.Kt$d:
     1:1:void <init>(java.lang.String,int):28:28 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexClass):31:31 -> a
-com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.pt$e:
+com.android.tools.r8.shaking.ProguardClassType$5 -> com.android.tools.r8.internal.Kt$e:
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
     boolean matches(com.android.tools.r8.graph.DexClass) -> a
-com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.S0:
+com.android.tools.r8.shaking.ProguardConfiguration -> com.android.tools.r8.shaking.V0:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.lang.String packagePrefix -> f
     boolean optimizing -> i
@@ -72790,8 +73291,8 @@
     1:1:java.lang.String getRenameSourceFileAttribute():619:619 -> x
     1:1:java.util.List getRules():639:639 -> y
     1:1:java.nio.file.Path getSeedFile():683:683 -> z
-com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.shaking.S0$a:
-com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.S0$b:
+com.android.tools.r8.shaking.ProguardConfiguration$1 -> com.android.tools.r8.shaking.V0$a:
+com.android.tools.r8.shaking.ProguardConfiguration$Builder -> com.android.tools.r8.shaking.V0$b:
     boolean printConfiguration -> m
     com.android.tools.r8.shaking.ProguardClassFilter$Builder dontNotePatterns -> y
     java.nio.file.Path obfuscationDictionary -> D
@@ -72917,7 +73418,7 @@
     1:10:void synthesizeKeepRulesForRecompilation():312:321 -> p
     11:11:void synthesizeKeepRulesForRecompilation():318:318 -> p
     12:12:void synthesizeKeepRulesForRecompilation():317:317 -> p
-com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.T0:
+com.android.tools.r8.shaking.ProguardConfigurationParser -> com.android.tools.r8.shaking.W0:
     boolean allowTestOptions -> n
     int $r8$clinit -> j
     java.util.List IGNORED_OPTIONAL_SINGLE_ARG_OPTIONS -> b
@@ -72958,24 +73459,24 @@
     1:1:com.android.tools.r8.shaking.ProguardConfiguration$Builder getConfigurationBuilder():122:122 -> l
     1:7:void validate():126:132 -> m
     8:24:void validate():129:145 -> m
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.T0$a:
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards -> com.android.tools.r8.shaking.W0$a:
     java.util.List wildcards -> b
     java.lang.String pattern -> a
-    1:3:void <init>(java.lang.String,java.util.List):2160:2162 -> <init>
-    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2166:2166 -> a
-    2:3:boolean hasBackreference():2174:2175 -> a
-    1:15:boolean hasUnusualCharacters():2179:2193 -> b
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.T0$b:
+    1:3:void <init>(java.lang.String,java.util.List):2176:2178 -> <init>
+    1:1:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards withoutWildcards(java.lang.String):2182:2182 -> a
+    2:3:boolean hasBackreference():2190:2191 -> a
+    1:15:boolean hasUnusualCharacters():2195:2209 -> b
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation -> com.android.tools.r8.shaking.W0$b:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards patternWithWildcards -> a
     boolean negated -> b
-    1:3:void <init>(java.lang.String,java.util.List,boolean):2204:2206 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.T0$c:
+    1:3:void <init>(java.lang.String,java.util.List,boolean):2220:2222 -> <init>
+com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType -> com.android.tools.r8.shaking.W0$c:
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType CLASS_NAME -> b
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType PACKAGE_NAME -> a
     com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType ANY -> c
     1:3:void <clinit>():190:192 -> <clinit>
     1:1:void <init>(java.lang.String,int):189:189 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.T0$d:
+com.android.tools.r8.shaking.ProguardConfigurationParser$ProguardConfigurationSourceParser -> com.android.tools.r8.shaking.W0$d:
     java.util.function.Predicate CLASS_NAME_PREDICATE -> j
     java.util.function.Predicate PACKAGE_NAME_PREDICATE -> k
     com.android.tools.r8.shaking.ProguardConfigurationParser this$0 -> l
@@ -72990,942 +73491,973 @@
     java.lang.String name -> b
     1:1:void <clinit>():195:195 -> <clinit>
     1:1:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):205:205 -> <init>
-    2:1512:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):198:1708 -> <init>
-    1513:1516:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):207:210 -> <init>
+    2:1528:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):198:1724 -> <init>
+    1529:1532:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser,com.android.tools.r8.shaking.ProguardConfigurationSource):207:210 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule$Builder com.android.tools.r8.shaking.ProguardCheckDiscardRule.builder():74:74 -> a
-    1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):733 -> a
-    2:2:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):733:733 -> a
+    1:1:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):738 -> a
+    2:2:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):738:738 -> a
     3:3:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    3:3:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):734 -> a
+    3:3:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):739 -> a
     4:4:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    4:4:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):735 -> a
-    5:7:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):736:738 -> a
+    4:4:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):740 -> a
+    5:7:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):741:743 -> a
     8:8:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    8:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):739 -> a
-    9:9:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):740:740 -> a
+    8:8:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):744 -> a
+    9:9:com.android.tools.r8.shaking.ProguardCheckDiscardRule parseCheckDiscardRule(com.android.tools.r8.position.Position):745:745 -> a
     10:10:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule.builder():91:91 -> a
-    10:10:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):746 -> a
-    11:11:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):746:746 -> a
+    10:10:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):751 -> a
+    11:11:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):751:751 -> a
     12:12:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    12:12:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):746 -> a
+    12:12:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):751 -> a
     13:13:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    13:13:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):746 -> a
+    13:13:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):751 -> a
     14:14:com.android.tools.r8.shaking.ClassInlineRule$Builder com.android.tools.r8.shaking.ClassInlineRule$Builder.setType(com.android.tools.r8.shaking.ClassInlineRule$Type):32:32 -> a
-    14:14:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):746 -> a
-    15:17:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):747:749 -> a
+    14:14:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):751 -> a
+    15:17:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):752:754 -> a
     18:18:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    18:18:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):750 -> a
+    18:18:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):755 -> a
     19:29:com.android.tools.r8.shaking.ClassInlineRule com.android.tools.r8.shaking.ClassInlineRule$Builder.build():38:48 -> a
-    19:29:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):751 -> a
+    19:29:com.android.tools.r8.shaking.ClassInlineRule parseClassInlineRule(com.android.tools.r8.shaking.ClassInlineRule$Type,com.android.tools.r8.position.Position):756 -> a
     30:30:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder com.android.tools.r8.shaking.ReprocessClassInitializerRule.builder():92:92 -> a
-    30:30:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):875 -> a
-    31:31:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):875:875 -> a
+    30:30:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891 -> a
+    31:31:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891:891 -> a
     32:32:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    32:32:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):875 -> a
+    32:32:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891 -> a
     33:33:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    33:33:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):875 -> a
-    34:37:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):875:878 -> a
+    33:33:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891 -> a
+    34:37:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):891:894 -> a
     38:38:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    38:38:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):879 -> a
-    39:39:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):880:880 -> a
+    38:38:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):895 -> a
+    39:39:com.android.tools.r8.shaking.ReprocessClassInitializerRule parseReprocessClassInitializerRule(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.position.Position):896:896 -> a
     40:40:com.android.tools.r8.shaking.ReprocessMethodRule$Builder com.android.tools.r8.shaking.ReprocessMethodRule.builder():92:92 -> a
-    40:40:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):886 -> a
-    41:41:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):886:886 -> a
+    40:40:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902 -> a
+    41:41:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902:902 -> a
     42:42:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    42:42:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):886 -> a
+    42:42:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902 -> a
     43:43:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    43:43:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):886 -> a
-    44:47:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):886:889 -> a
+    43:43:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902 -> a
+    44:47:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):902:905 -> a
     48:48:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    48:48:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):890 -> a
-    49:49:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):891:891 -> a
+    48:48:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):906 -> a
+    49:49:com.android.tools.r8.shaking.ReprocessMethodRule parseReprocessMethodRule(com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.position.Position):907:907 -> a
     50:50:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule.builder():97:97 -> a
-    50:50:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):801 -> a
-    51:51:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):801:801 -> a
+    50:50:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):817 -> a
+    51:51:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):817:817 -> a
     52:52:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> a
-    52:52:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):802 -> a
+    52:52:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):818 -> a
     53:53:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> a
-    53:53:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):803 -> a
+    53:53:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):819 -> a
     54:54:com.android.tools.r8.shaking.InlineRule$Builder com.android.tools.r8.shaking.InlineRule$Builder.setType(com.android.tools.r8.shaking.InlineRule$Type):38:38 -> a
-    54:54:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):804 -> a
-    55:57:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):805:807 -> a
+    54:54:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):820 -> a
+    55:57:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):821:823 -> a
     58:58:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> a
-    58:58:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):808 -> a
+    58:58:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):824 -> a
     59:69:com.android.tools.r8.shaking.InlineRule com.android.tools.r8.shaking.InlineRule$Builder.build():44:54 -> a
-    59:69:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):809 -> a
-    70:73:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):530:530 -> a
-    74:78:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1042:1046 -> a
-    74:78:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):934 -> a
-    79:80:boolean parseNegation():1033:1034 -> a
-    79:80:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1048 -> a
-    79:80:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):934 -> a
+    59:69:com.android.tools.r8.shaking.InlineRule parseInlineRule(com.android.tools.r8.shaking.InlineRule$Type,com.android.tools.r8.position.Position):825 -> a
+    70:73:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.String):535:535 -> a
+    74:78:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1058:1062 -> a
+    74:78:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
+    79:80:boolean parseNegation():1049:1050 -> a
+    79:80:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1064 -> a
+    79:80:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
     81:81:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getNegatedClassAccessFlags():160:160 -> a
-    81:81:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1049 -> a
-    81:81:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):934 -> a
+    81:81:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1065 -> a
+    81:81:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
     82:82:com.android.tools.r8.shaking.ProguardAccessFlags com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getClassAccessFlags():151:151 -> a
-    82:82:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1050 -> a
-    82:82:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):934 -> a
-    83:92:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1051:1060 -> a
-    83:92:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):934 -> a
-    93:95:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1073:1075 -> a
-    93:95:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
+    82:82:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1066 -> a
+    82:82:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
+    83:92:void parseClassAnnotationsAndFlags(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1067:1076 -> a
+    83:92:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):950 -> a
+    93:95:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1089:1091 -> a
+    93:95:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
     96:97:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassTypeNegated(boolean):146:147 -> a
-    96:97:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1076 -> a
-    96:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    98:101:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1078:1081 -> a
-    98:101:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
+    96:97:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1092 -> a
+    96:97:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    98:101:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1094:1097 -> a
+    98:101:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
     102:103:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    102:103:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1081 -> a
-    102:103:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    104:104:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1083:1083 -> a
-    104:104:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    105:106:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1068:1069 -> a
-    105:106:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1083 -> a
-    105:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    107:110:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1083:1086 -> a
-    107:110:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
+    102:103:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1097 -> a
+    102:103:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    104:104:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1099:1099 -> a
+    104:104:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    105:106:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1084:1085 -> a
+    105:106:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1099 -> a
+    105:106:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    107:110:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1099:1102 -> a
+    107:110:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
     111:112:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    111:112:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1086 -> a
-    111:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    113:114:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1087:1088 -> a
-    113:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
+    111:112:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1102 -> a
+    111:112:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    113:114:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1103:1104 -> a
+    113:114:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
     115:116:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    115:116:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1088 -> a
-    115:116:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    117:118:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1089:1090 -> a
-    117:118:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
+    115:116:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1104 -> a
+    115:116:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    117:118:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1105:1106 -> a
+    117:118:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
     119:120:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setClassType(com.android.tools.r8.shaking.ProguardClassType):137:138 -> a
-    119:120:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1090 -> a
-    119:120:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    121:121:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):936:936 -> a
-    122:123:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1099:1100 -> a
-    122:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):937 -> a
+    119:120:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1106 -> a
+    119:120:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    121:121:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):952:952 -> a
+    122:123:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1115:1116 -> a
+    122:123:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
     124:125:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
-    124:125:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1101 -> a
-    124:125:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):937 -> a
-    126:126:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1102:1102 -> a
-    126:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):937 -> a
+    124:125:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1117 -> a
+    124:125:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    126:126:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1118:1118 -> a
+    126:126:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
     127:128:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceIsExtends(boolean):96:97 -> a
-    127:128:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1103 -> a
-    127:128:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):937 -> a
-    129:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1107:1109 -> a
-    129:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):937 -> a
-    132:132:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108:1108 -> a
-    132:132:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):937 -> a
+    127:128:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1119 -> a
+    127:128:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    129:131:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1123:1125 -> a
+    129:131:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    132:132:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1124:1124 -> a
+    132:132:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
     133:134:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setInheritanceClassName(com.android.tools.r8.shaking.ProguardTypeMatcher):109:110 -> a
-    133:134:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108 -> a
-    133:134:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):937 -> a
-    135:136:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1118:1119 -> a
-    135:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    137:138:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1131:1132 -> a
-    137:138:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    137:138:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    139:139:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1140:1140 -> a
-    139:139:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    139:139:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    139:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    140:141:boolean parseNegation():1033:1034 -> a
-    140:141:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1142 -> a
-    140:141:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    140:141:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    142:187:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1144:1189 -> a
-    142:187:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    142:187:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    142:187:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    188:205:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1177:1194 -> a
-    188:205:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    188:205:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    188:205:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    206:211:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1168:1173 -> a
-    206:211:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    206:211:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    206:211:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    212:213:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1163:1164 -> a
-    212:213:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    212:213:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    212:213:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    214:215:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1158:1159 -> a
-    214:215:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    214:215:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    214:215:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    216:217:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1153:1154 -> a
-    216:217:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    216:217:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    216:217:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    218:274:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1148:1204 -> a
-    218:274:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1133 -> a
-    218:274:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    218:274:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    275:312:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1212:1249 -> a
-    275:312:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    275:312:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    275:312:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
+    133:134:void parseInheritance(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1124 -> a
+    133:134:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):953 -> a
+    135:136:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1134:1135 -> a
+    135:136:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    137:138:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1147:1148 -> a
+    137:138:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    137:138:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    139:139:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1156:1156 -> a
+    139:139:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    139:139:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    139:139:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    140:141:boolean parseNegation():1049:1050 -> a
+    140:141:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1158 -> a
+    140:141:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    140:141:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    140:141:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    142:187:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1160:1205 -> a
+    142:187:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    142:187:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    142:187:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    188:205:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1193:1210 -> a
+    188:205:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    188:205:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    188:205:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    206:211:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1184:1189 -> a
+    206:211:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    206:211:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    206:211:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    212:213:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1179:1180 -> a
+    212:213:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    212:213:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    212:213:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    214:215:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1174:1175 -> a
+    214:215:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    214:215:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    214:215:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    216:217:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1169:1170 -> a
+    216:217:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    216:217:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    216:217:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    218:274:void parseMemberAccessFlags(com.android.tools.r8.shaking.ProguardMemberRule$Builder):1164:1220 -> a
+    218:274:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1149 -> a
+    218:274:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    218:274:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    275:312:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1228:1265 -> a
+    275:312:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    275:312:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    275:312:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
     313:313:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    313:313:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1250 -> a
-    313:313:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    313:313:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    313:313:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    314:320:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1251:1257 -> a
-    314:320:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    314:320:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    314:320:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    321:329:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1252:1260 -> a
-    321:329:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    321:329:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    321:329:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
+    313:313:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1266 -> a
+    313:313:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    313:313:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    313:313:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    314:320:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1267:1273 -> a
+    314:320:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    314:320:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    314:320:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    321:329:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1268:1276 -> a
+    321:329:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    321:329:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    321:329:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
     330:330:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.matchesSpecificType():147:147 -> a
-    330:330:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1261 -> a
-    330:330:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    330:330:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    330:330:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    331:337:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1262:1268 -> a
-    331:337:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    331:337:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    331:337:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    338:360:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1263:1285 -> a
-    338:360:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    338:360:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    338:360:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    361:375:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1284:1298 -> a
-    361:375:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    361:375:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    361:375:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    376:390:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1297:1311 -> a
-    376:390:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    376:390:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    376:390:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    391:396:java.lang.String acceptFieldNameOrIntegerForReturn():1848:1853 -> a
-    391:396:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1312 -> a
-    391:396:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    391:396:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    391:396:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    397:397:char peekCharAt(int):1646:1646 -> a
-    397:397:java.lang.String acceptFieldNameOrIntegerForReturn():1853 -> a
-    397:397:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1312 -> a
-    397:397:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    397:397:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    397:397:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    398:398:boolean eof(int):1595:1595 -> a
-    398:398:char peekCharAt(int):1646 -> a
-    398:398:java.lang.String acceptFieldNameOrIntegerForReturn():1853 -> a
-    398:398:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1312 -> a
-    398:398:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    398:398:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    398:398:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    399:400:char peekCharAt(int):1646:1647 -> a
-    399:400:java.lang.String acceptFieldNameOrIntegerForReturn():1853 -> a
-    399:400:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1312 -> a
-    399:400:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    399:400:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    399:400:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    401:413:java.lang.String acceptFieldNameOrIntegerForReturn():1857:1869 -> a
-    401:413:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1312 -> a
-    401:413:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    401:413:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    401:413:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    414:415:boolean isInteger(java.lang.String):1582:1583 -> a
-    414:415:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1314 -> a
-    414:415:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    414:415:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    414:415:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    416:430:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1315:1329 -> a
-    416:430:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    416:430:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    416:430:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    431:431:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328:1328 -> a
-    431:431:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    431:431:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    431:431:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    432:444:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1326:1338 -> a
-    432:444:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    432:444:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    432:444:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    445:445:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1337:1337 -> a
-    445:445:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    445:445:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    445:445:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    446:451:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1336:1341 -> a
-    446:451:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    446:451:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    446:451:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    452:475:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1340:1363 -> a
-    452:475:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1134 -> a
-    452:475:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    452:475:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    476:476:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1135:1135 -> a
-    476:476:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1121 -> a
-    476:476:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
+    330:330:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1277 -> a
+    330:330:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    330:330:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    330:330:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    331:337:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1278:1284 -> a
+    331:337:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    331:337:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    331:337:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    338:360:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1279:1301 -> a
+    338:360:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    338:360:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    338:360:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    361:375:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1300:1314 -> a
+    361:375:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    361:375:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    361:375:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    376:390:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1313:1327 -> a
+    376:390:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    376:390:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    376:390:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    391:396:java.lang.String acceptFieldNameOrIntegerForReturn():1864:1869 -> a
+    391:396:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
+    391:396:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    391:396:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    391:396:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    397:397:char peekCharAt(int):1662:1662 -> a
+    397:397:java.lang.String acceptFieldNameOrIntegerForReturn():1869 -> a
+    397:397:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
+    397:397:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    397:397:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    397:397:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    398:398:boolean eof(int):1611:1611 -> a
+    398:398:char peekCharAt(int):1662 -> a
+    398:398:java.lang.String acceptFieldNameOrIntegerForReturn():1869 -> a
+    398:398:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
+    398:398:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    398:398:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    398:398:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    399:400:char peekCharAt(int):1662:1663 -> a
+    399:400:java.lang.String acceptFieldNameOrIntegerForReturn():1869 -> a
+    399:400:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
+    399:400:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    399:400:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    399:400:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    401:413:java.lang.String acceptFieldNameOrIntegerForReturn():1873:1885 -> a
+    401:413:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1328 -> a
+    401:413:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    401:413:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    401:413:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    414:415:boolean isInteger(java.lang.String):1598:1599 -> a
+    414:415:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1330 -> a
+    414:415:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    414:415:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    414:415:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    416:430:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1331:1345 -> a
+    416:430:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    416:430:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    416:430:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    431:431:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1344:1344 -> a
+    431:431:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    431:431:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    431:431:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    432:444:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1342:1354 -> a
+    432:444:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    432:444:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    432:444:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    445:445:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1353:1353 -> a
+    445:445:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    445:445:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    445:445:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    446:451:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1352:1357 -> a
+    446:451:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    446:451:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    446:451:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    452:475:void parseMemberPattern(com.android.tools.r8.shaking.ProguardMemberRule$Builder,boolean):1356:1379 -> a
+    452:475:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1150 -> a
+    452:475:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    452:475:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    476:476:com.android.tools.r8.shaking.ProguardMemberRule parseMemberRule(boolean):1151:1151 -> a
+    476:476:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1137 -> a
+    476:476:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
     477:477:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> a
-    477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1122 -> a
-    477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    478:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1122:1125 -> a
-    478:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):938 -> a
-    482:482:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1092:1092 -> a
-    482:482:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    483:484:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1068:1069 -> a
-    483:484:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1092 -> a
-    483:484:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    485:485:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1092:1092 -> a
-    485:485:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):935 -> a
-    486:495:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1370:1379 -> a
-    496:496:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1376:1376 -> a
-    497:518:java.nio.file.Path parseFileName(boolean):1447:1468 -> a
-    519:519:java.nio.file.Path parseFileName(boolean):1466:1466 -> a
-    520:540:java.lang.String replaceSystemPropertyReferences(java.lang.String):1413:1433 -> a
-    520:540:java.nio.file.Path parseFileName(boolean):1471 -> a
-    541:553:java.lang.String replaceSystemPropertyReferences(java.lang.String):1431:1443 -> a
-    541:553:java.nio.file.Path parseFileName(boolean):1471 -> a
-    554:554:java.nio.file.Path parseFileName(boolean):1473:1473 -> a
-    555:555:java.nio.file.Path parseFileName(boolean):1462:1462 -> a
-    556:556:java.nio.file.Path parseFileName(boolean):1451:1451 -> a
-    557:560:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1457:1460 -> a
-    561:561:boolean eof(int):1595:1595 -> a
-    562:563:boolean acceptChar(char):1617:1618 -> a
-    564:564:int remainingChars():1655:1655 -> a
-    564:564:boolean acceptString(java.lang.String):1665 -> a
-    565:573:boolean acceptString(java.lang.String):1665:1673 -> a
-    574:574:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1683:1683 -> a
-    575:579:java.lang.Integer acceptInteger():1691:1695 -> a
-    580:585:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1721:1726 -> a
-    586:612:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1731:1757 -> a
-    613:615:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1752:1752 -> a
-    623:626:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1760:1760 -> a
-    632:638:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1766:1772 -> a
-    639:694:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1771:1826 -> a
-    695:695:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1822:1822 -> a
-    696:696:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1816:1816 -> a
-    697:724:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1811:1838 -> a
-    725:732:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1837:1844 -> a
-    733:736:boolean lambda$acceptPattern$7(java.lang.Integer):1908:1911 -> a
-    737:751:java.lang.String acceptString(java.util.function.Predicate):1915:1929 -> a
-    752:754:void parseClassFilter(java.util.function.Consumer):1961:1963 -> a
+    477:477:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1138 -> a
+    477:477:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    478:481:void parseMemberRules(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):1138:1141 -> a
+    478:481:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):954 -> a
+    482:482:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108:1108 -> a
+    482:482:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    483:484:com.android.tools.r8.utils.StringDiagnostic parseClassTypeUnexpected(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.TextPosition):1084:1085 -> a
+    483:484:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108 -> a
+    483:484:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    485:485:void parseClassType(com.android.tools.r8.shaking.ProguardClassSpecification$Builder):1108:1108 -> a
+    485:485:void parseClassSpec(com.android.tools.r8.shaking.ProguardClassSpecification$Builder,boolean):951 -> a
+    486:495:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1386:1395 -> a
+    496:496:void checkConstructorPattern(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards,com.android.tools.r8.position.TextPosition):1392:1392 -> a
+    497:518:java.nio.file.Path parseFileName(boolean):1463:1484 -> a
+    519:519:java.nio.file.Path parseFileName(boolean):1482:1482 -> a
+    520:540:java.lang.String replaceSystemPropertyReferences(java.lang.String):1429:1449 -> a
+    520:540:java.nio.file.Path parseFileName(boolean):1487 -> a
+    541:553:java.lang.String replaceSystemPropertyReferences(java.lang.String):1447:1459 -> a
+    541:553:java.nio.file.Path parseFileName(boolean):1487 -> a
+    554:554:java.nio.file.Path parseFileName(boolean):1489:1489 -> a
+    555:555:java.nio.file.Path parseFileName(boolean):1478:1478 -> a
+    556:556:java.nio.file.Path parseFileName(boolean):1467:1467 -> a
+    557:560:boolean lambda$parseFileName$1(boolean,char,boolean,java.lang.Integer):1473:1476 -> a
+    561:561:boolean eof(int):1611:1611 -> a
+    562:563:boolean acceptChar(char):1633:1634 -> a
+    564:564:int remainingChars():1671:1671 -> a
+    564:564:boolean acceptString(java.lang.String):1681 -> a
+    565:573:boolean acceptString(java.lang.String):1681:1689 -> a
+    574:574:boolean lambda$acceptQuotedOrUnquotedString$4(char,java.lang.Integer):1699:1699 -> a
+    575:579:java.lang.Integer acceptInteger():1707:1711 -> a
+    580:585:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType):1737:1742 -> a
+    586:612:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1747:1773 -> a
+    613:615:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1768:1768 -> a
+    623:626:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1776:1776 -> a
+    632:638:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1782:1788 -> a
+    639:694:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1787:1842 -> a
+    695:695:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1838:1838 -> a
+    696:696:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1832:1832 -> a
+    697:724:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1827:1854 -> a
+    725:732:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation acceptIdentifierWithBackreference(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierType,boolean):1853:1860 -> a
+    733:736:boolean lambda$acceptPattern$7(java.lang.Integer):1924:1927 -> a
+    737:751:java.lang.String acceptString(java.util.function.Predicate):1931:1945 -> a
+    752:754:void parseClassFilter(java.util.function.Consumer):1977:1979 -> a
     755:755:com.android.tools.r8.shaking.ProguardTypeMatcher com.android.tools.r8.shaking.ProguardTypeMatcher.defaultAllMatcher():129:129 -> a
-    755:755:void parseClassFilter(java.util.function.Consumer):1966 -> a
-    756:756:void parseClassFilter(java.util.function.Consumer):1966:1966 -> a
-    757:757:void parseClassFilter(java.util.function.Consumer):1965:1965 -> a
-    758:760:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2093:2093 -> a
-    761:763:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2103:2103 -> a
-    764:770:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2109:2109 -> a
-    771:774:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2123:2126 -> a
-    775:776:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2139:2140 -> a
+    755:755:void parseClassFilter(java.util.function.Consumer):1982 -> a
+    756:756:void parseClassFilter(java.util.function.Consumer):1982:1982 -> a
+    757:757:void parseClassFilter(java.util.function.Consumer):1981:1981 -> a
+    758:760:void infoIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2109:2109 -> a
+    761:763:void warnOverridingOptions(java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2119:2119 -> a
+    764:770:void warnUnusualCharacters(java.lang.String,java.lang.String,java.lang.String,com.android.tools.r8.position.TextPosition):2125:2125 -> a
+    771:774:com.android.tools.r8.position.Position getPosition(com.android.tools.r8.position.TextPosition):2139:2142 -> a
+    775:776:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2155:2156 -> a
     777:777:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):0:0 -> a
-    777:777:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2140 -> a
-    778:2930:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):0:2152 -> a
-    778:2930:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):45 -> a
-    778:2930:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2140 -> a
-    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):567:569 -> b
-    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):568:571 -> b
-    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):662:670 -> b
-    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):572 -> b
-    17:17:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):698:698 -> b
+    777:777:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2156 -> a
+    778:2946:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.getTextSourceSnippet(java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):0:2168 -> a
+    778:2946:java.lang.String com.android.tools.r8.shaking.ProguardConfigurationParser.access$1300(com.android.tools.r8.shaking.ProguardConfigurationParser,java.lang.String,com.android.tools.r8.position.TextPosition,com.android.tools.r8.position.TextPosition):45 -> a
+    778:2946:java.lang.String getSourceSnippet(java.lang.String,com.android.tools.r8.position.Position,com.android.tools.r8.position.Position):2156 -> a
+    1:3:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):572:574 -> b
+    4:7:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):573:576 -> b
+    8:16:boolean parseOptimizationOption(com.android.tools.r8.position.TextPosition):667:675 -> b
+    8:16:boolean parseIgnoredOption(com.android.tools.r8.position.TextPosition):577 -> b
+    17:17:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):703:703 -> b
     18:18:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:53 -> b
-    18:18:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):699 -> b
+    18:18:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):704 -> b
     19:19:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:58 -> b
-    19:19:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):700 -> b
-    20:21:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):942:943 -> b
-    20:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    19:19:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):705 -> b
+    20:21:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):958:959 -> b
+    20:21:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     22:22:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    22:22:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):944 -> b
-    22:22:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    23:30:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):944:951 -> b
-    23:30:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    22:22:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):960 -> b
+    22:22:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    23:30:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):960:967 -> b
+    23:30:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     31:31:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    31:31:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):952 -> b
-    31:31:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    32:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):952:954 -> b
-    32:34:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    31:31:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):968 -> b
+    31:31:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    32:34:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):968:970 -> b
+    32:34:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     35:35:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    35:35:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):955 -> b
-    35:35:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    36:42:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):955:961 -> b
-    36:42:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    43:43:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):525:525 -> b
-    43:43:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):962 -> b
-    43:43:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    44:51:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):965:972 -> b
-    44:51:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    52:52:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):525:525 -> b
-    52:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):973 -> b
-    52:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    53:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):979:984 -> b
-    53:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    53:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    35:35:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):971 -> b
+    35:35:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    36:42:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):971:977 -> b
+    36:42:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    43:43:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):530:530 -> b
+    43:43:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):978 -> b
+    43:43:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    44:51:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):981:988 -> b
+    44:51:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    52:52:java.lang.RuntimeException unknownOption(java.lang.String,com.android.tools.r8.position.TextPosition):530:530 -> b
+    52:52:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):989 -> b
+    52:52:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    53:58:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):995:1000 -> b
+    53:58:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    53:58:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     59:59:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):985 -> b
-    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    60:61:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):985:986 -> b
-    60:61:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    60:61:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    59:59:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1001 -> b
+    59:59:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    59:59:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    60:61:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1001:1002 -> b
+    60:61:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    60:61:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     62:62:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    62:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):987 -> b
-    62:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    62:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    63:64:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):987:988 -> b
-    63:64:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    63:64:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    62:62:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1003 -> b
+    62:62:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    62:62:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    63:64:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1003:1004 -> b
+    63:64:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    63:64:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     65:65:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    65:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):989 -> b
-    65:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    65:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):989:990 -> b
-    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    65:65:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1005 -> b
+    65:65:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    65:65:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    66:67:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1005:1006 -> b
+    66:67:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    66:67:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     68:68:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
-    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    69:71:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991:993 -> b
-    69:71:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    69:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
+    68:68:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1007 -> b
+    68:68:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    68:68:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    69:71:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1007:1009 -> b
+    69:71:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    69:71:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
     72:72:com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder.getModifiersBuilder():30:30 -> b
-    72:72:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):994 -> b
-    72:72:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    72:72:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    73:74:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):994:995 -> b
-    73:74:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    73:74:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    75:77:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2118:2118 -> b
-    75:77:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):996 -> b
-    75:77:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    75:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    78:78:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):998:998 -> b
-    78:78:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):975 -> b
-    78:78:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):701 -> b
-    79:79:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):702:702 -> b
+    72:72:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1010 -> b
+    72:72:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    72:72:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    73:74:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1010:1011 -> b
+    73:74:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    73:74:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    75:77:void infoIgnoringModifier(java.lang.String,com.android.tools.r8.position.TextPosition):2134:2134 -> b
+    75:77:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1012 -> b
+    75:77:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    75:77:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    78:78:void parseRuleModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):1014:1014 -> b
+    78:78:void parseRuleTypeAndModifiers(com.android.tools.r8.shaking.ProguardKeepRule$Builder):991 -> b
+    78:78:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):706 -> b
+    79:79:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):707:707 -> b
     80:80:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> b
-    80:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):703 -> b
-    81:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):703:708 -> b
-    87:90:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):707:710 -> b
+    80:80:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):708 -> b
+    81:86:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):708:713 -> b
+    87:90:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):712:715 -> b
     91:91:java.util.List com.android.tools.r8.shaking.ProguardClassSpecification$Builder.getMemberRules():83:83 -> b
-    91:91:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):711 -> b
-    92:95:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):711:714 -> b
+    91:91:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):716 -> b
+    92:95:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):716:719 -> b
     96:96:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> b
-    96:96:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):715 -> b
-    97:97:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):716:716 -> b
-    98:99:void expectChar(char):1659:1660 -> b
-    100:100:boolean lambda$acceptString$3(java.lang.Integer):1678:1678 -> b
-    101:101:java.lang.String acceptPattern():1906:1906 -> b
-    102:106:void parsePathFilter(java.util.function.Consumer):2014:2018 -> b
-    107:107:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2073:2073 -> b
-    108:117:java.lang.String snippetForPosition():2049:2058 -> b
-    108:117:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2073 -> b
-    118:124:java.lang.String snippetForPosition():2054:2060 -> b
-    118:124:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2073 -> b
-    125:125:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2073:2073 -> b
-    126:127:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2088:2089 -> b
-    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):547:554 -> c
-    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):553:553 -> c
-    10:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2098:2098 -> c
-    10:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):561 -> c
-    13:15:boolean skipFlag(java.lang.String):610:612 -> c
-    16:16:char acceptQuoteIfPresent():1626:1626 -> c
-    17:20:boolean hasNextChar(java.util.function.Predicate):1606:1609 -> c
-    17:20:char acceptQuoteIfPresent():1626 -> c
-    21:21:char readChar():1651:1651 -> c
-    21:21:char acceptQuoteIfPresent():1626 -> c
-    22:26:void expectClosingQuote(char):1630:1634 -> c
-    27:27:void expectClosingQuote(char):1632:1632 -> c
-    28:34:boolean lambda$new$5(java.lang.Integer):1700:1706 -> c
-    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):536:539 -> d
-    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):538:538 -> d
-    6:15:boolean skipOptionWithClassSpec(java.lang.String):645:654 -> d
-    16:19:boolean hasNextChar(char):1599:1602 -> d
-    20:23:java.lang.String acceptQuotedOrUnquotedString():1682:1685 -> d
-    24:27:boolean lambda$new$6(java.lang.Integer):1710:1713 -> d
+    96:96:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):720 -> b
+    97:97:com.android.tools.r8.shaking.ProguardKeepRule parseKeepRule(com.android.tools.r8.position.Position):721:721 -> b
+    98:99:void expectChar(char):1675:1676 -> b
+    100:100:boolean lambda$acceptString$3(java.lang.Integer):1694:1694 -> b
+    101:101:java.lang.String acceptPattern():1922:1922 -> b
+    102:106:void parsePathFilter(java.util.function.Consumer):2030:2034 -> b
+    107:107:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089:2089 -> b
+    108:117:java.lang.String snippetForPosition():2065:2074 -> b
+    108:117:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089 -> b
+    118:124:java.lang.String snippetForPosition():2070:2076 -> b
+    118:124:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089 -> b
+    125:125:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String):2089:2089 -> b
+    126:127:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition):2104:2105 -> b
+    1:8:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):552:559 -> c
+    9:9:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):558:558 -> c
+    10:12:void warnIgnoringOptions(java.lang.String,com.android.tools.r8.position.TextPosition):2114:2114 -> c
+    10:12:boolean parseIgnoredOptionAndWarn(com.android.tools.r8.position.TextPosition):566 -> c
+    13:15:boolean skipFlag(java.lang.String):615:617 -> c
+    16:16:char acceptQuoteIfPresent():1642:1642 -> c
+    17:20:boolean hasNextChar(java.util.function.Predicate):1622:1625 -> c
+    17:20:char acceptQuoteIfPresent():1642 -> c
+    21:21:char readChar():1667:1667 -> c
+    21:21:char acceptQuoteIfPresent():1642 -> c
+    22:26:void expectClosingQuote(char):1646:1650 -> c
+    27:27:void expectClosingQuote(char):1648:1648 -> c
+    28:34:boolean lambda$new$5(java.lang.Integer):1716:1722 -> c
+    1:4:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):541:544 -> d
+    5:5:boolean parseUnsupportedOptionAndErr(com.android.tools.r8.position.TextPosition):543:543 -> d
+    6:15:boolean skipOptionWithClassSpec(java.lang.String):650:659 -> d
+    16:19:boolean hasNextChar(char):1615:1618 -> d
+    20:23:java.lang.String acceptQuotedOrUnquotedString():1698:1701 -> d
+    24:27:boolean lambda$new$6(java.lang.Integer):1726:1729 -> d
     boolean isQuote(char) -> e
-    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):631:637 -> e
-    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1515:1516 -> e
-    10:10:java.lang.String acceptString():1678:1678 -> e
-    11:14:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2065:2068 -> e
-    1:5:boolean skipOptionWithSingleArg(java.lang.String):620:624 -> f
-    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):682:682 -> f
-    7:7:boolean eof():1591:1591 -> f
-    1:4:void unacceptString(java.lang.String):1933:1936 -> g
-    5:5:boolean pathFilterMatcher(java.lang.Integer):2009:2009 -> g
-    6:6:com.android.tools.r8.position.TextPosition getPosition():2131:2131 -> g
-    7:7:int getColumn():2135:2135 -> g
-    7:7:com.android.tools.r8.position.TextPosition getPosition():2131 -> g
-    8:8:com.android.tools.r8.position.TextPosition getPosition():2131:2131 -> g
-    1:1:boolean isOptionalArgumentGiven():1613:1613 -> h
+    1:7:boolean skipOptionWithOptionalSingleArg(java.lang.String):636:642 -> e
+    8:9:boolean lambda$parseFileFilter$2(java.lang.Integer):1531:1532 -> e
+    10:10:java.lang.String acceptString():1694:1694 -> e
+    11:14:java.lang.String snippetForPosition(com.android.tools.r8.position.TextPosition):2081:2084 -> e
+    1:5:boolean skipOptionWithSingleArg(java.lang.String):625:629 -> f
+    6:6:boolean lambda$skipOptimizationName$0(java.lang.Integer):687:687 -> f
+    7:7:boolean eof():1607:1607 -> f
+    1:4:void unacceptString(java.lang.String):1949:1952 -> g
+    5:5:boolean pathFilterMatcher(java.lang.Integer):2025:2025 -> g
+    6:6:com.android.tools.r8.position.TextPosition getPosition():2147:2147 -> g
+    7:7:int getColumn():2151:2151 -> g
+    7:7:com.android.tools.r8.position.TextPosition getPosition():2147 -> g
+    8:8:com.android.tools.r8.position.TextPosition getPosition():2147:2147 -> g
+    1:1:boolean isOptionalArgumentGiven():1629:1629 -> h
     1:6:void parse():215:220 -> i
     7:12:void parse():219:224 -> i
-    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1015:1027 -> j
-    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1026:1026 -> j
-    1:7:java.util.List parseAnnotationList():1005:1011 -> k
-    1:12:java.util.List parseArgumentList():1385:1396 -> l
-    13:22:java.util.List parseArgumentList():1393:1402 -> l
-    23:25:java.util.List parseArgumentList():1401:1403 -> l
-    26:33:java.util.List parseArgumentList():1400:1407 -> l
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2000:2001 -> m
-    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1993 -> m
-    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1994:1995 -> m
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2003:2003 -> m
-    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():1993 -> m
-    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1980:1980 -> n
-    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2000:2001 -> n
-    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1972 -> n
-    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1982 -> n
-    4:7:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1973:1973 -> n
-    4:7:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1982 -> n
-    10:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1976:1976 -> n
-    10:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1982 -> n
-    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1983:1984 -> n
-    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2003:2003 -> n
-    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1972 -> n
-    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1982 -> n
-    1:10:java.util.List parseClassPath():1477:1486 -> o
-    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1492:1505 -> p
-    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1502:1507 -> p
-    1:7:java.lang.String parseFileFilter():1512:1518 -> q
-    1:10:void parseInclude():576:585 -> r
-    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2083:2084 -> r
-    11:12:void parseInclude():585 -> r
+    1:13:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1031:1043 -> j
+    14:14:com.android.tools.r8.shaking.ProguardTypeMatcher parseAnnotation():1042:1042 -> j
+    1:7:java.util.List parseAnnotationList():1021:1027 -> k
+    1:12:java.util.List parseArgumentList():1401:1412 -> l
+    13:22:java.util.List parseArgumentList():1409:1418 -> l
+    23:25:java.util.List parseArgumentList():1417:1419 -> l
+    26:33:java.util.List parseArgumentList():1416:1423 -> l
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2016:2017 -> m
+    1:2:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2009 -> m
+    3:4:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2010:2011 -> m
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2019:2019 -> m
+    5:5:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards parseClassName():2009 -> m
+    1:1:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1996:1996 -> n
+    2:3:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2016:2017 -> n
+    2:3:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1988 -> n
+    2:3:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> n
+    4:7:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1989:1989 -> n
+    4:7:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> n
+    10:10:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1992:1992 -> n
+    10:10:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> n
+    11:12:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1999:2000 -> n
+    13:13:com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcardsAndNegation parseClassName(boolean):2019:2019 -> n
+    13:13:void parseClassNameAddToBuilder(com.android.tools.r8.shaking.ProguardClassNameList$Builder):1988 -> n
+    13:13:com.android.tools.r8.shaking.ProguardClassNameList parseClassNames():1998 -> n
+    1:10:java.util.List parseClassPath():1493:1502 -> o
+    1:14:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1508:1521 -> p
+    15:20:com.android.tools.r8.com.google.common.collect.ImmutableList parseClassPathFilters():1518:1523 -> p
+    1:7:java.lang.String parseFileFilter():1528:1534 -> q
+    1:10:void parseInclude():581:590 -> r
+    11:12:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2099:2100 -> r
+    11:12:void parseInclude():590 -> r
     13:14:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> r
-    13:14:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2084 -> r
-    13:14:void parseInclude():585 -> r
-    15:15:void parseInclude():585:585 -> r
-    16:16:void parseInclude():582:582 -> r
-    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2083:2084 -> r
-    17:18:void parseInclude():582 -> r
+    13:14:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2100 -> r
+    13:14:void parseInclude():590 -> r
+    15:15:void parseInclude():590:590 -> r
+    16:16:void parseInclude():587:587 -> r
+    17:18:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2099:2100 -> r
+    17:18:void parseInclude():587 -> r
     19:20:void com.android.tools.r8.shaking.ProguardRuleParserException.<init>(java.lang.String,java.lang.String,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.Throwable):27:28 -> r
-    19:20:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2084 -> r
-    19:20:void parseInclude():582 -> r
-    21:21:void parseInclude():582:582 -> r
+    19:20:com.android.tools.r8.shaking.ProguardRuleParserException parseError(java.lang.String,com.android.tools.r8.position.TextPosition,java.lang.Throwable):2100 -> r
+    19:20:void parseInclude():587 -> r
+    21:21:void parseInclude():587:587 -> r
     1:1:boolean parseOption():228:228 -> s
-    2:2:int remainingChars():1655:1655 -> s
-    2:2:boolean acceptArobaseInclude():591 -> s
+    2:2:int remainingChars():1671:1671 -> s
+    2:2:boolean acceptArobaseInclude():596 -> s
     2:2:boolean parseOption():231 -> s
-    3:6:boolean acceptArobaseInclude():594:597 -> s
+    3:6:boolean acceptArobaseInclude():599:602 -> s
     3:6:boolean parseOption():231 -> s
     7:10:boolean parseOption():234:237 -> s
     11:12:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):432:433 -> s
     11:12:boolean parseOption():238 -> s
     13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule.builder():75:75 -> s
-    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1538 -> s
+    13:13:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554 -> s
     13:13:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     13:13:boolean parseOption():238 -> s
-    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1538:1538 -> s
+    14:14:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554:1554 -> s
     14:14:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     14:14:boolean parseOption():238 -> s
     15:16:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    15:16:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1538 -> s
+    15:16:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554 -> s
     15:16:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     15:16:boolean parseOption():238 -> s
-    17:17:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1538:1538 -> s
+    17:17:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554:1554 -> s
     17:17:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     17:17:boolean parseOption():238 -> s
     18:19:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    18:19:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1538 -> s
+    18:19:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554 -> s
     18:19:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     18:19:boolean parseOption():238 -> s
-    20:23:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1538:1541 -> s
+    20:23:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1554:1557 -> s
     20:23:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     20:23:boolean parseOption():238 -> s
     24:24:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    24:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1542 -> s
+    24:24:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1558 -> s
     24:24:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     24:24:boolean parseOption():238 -> s
     25:35:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule$Builder.build():26:36 -> s
-    25:35:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1543 -> s
+    25:35:com.android.tools.r8.shaking.ProguardAssumeMayHaveSideEffectsRule parseAssumeMayHaveSideEffectsRule(com.android.tools.r8.position.Position):1559 -> s
     25:35:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):435 -> s
     25:35:boolean parseOption():238 -> s
     36:47:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):436:447 -> s
     36:47:boolean parseOption():238 -> s
     48:48:com.android.tools.r8.shaking.ConstantArgumentRule$Builder com.android.tools.r8.shaking.ConstantArgumentRule.builder():74:74 -> s
-    48:48:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):852 -> s
+    48:48:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868 -> s
     48:48:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     48:48:boolean parseOption():238 -> s
-    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):852:852 -> s
+    49:49:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868:868 -> s
     49:49:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     49:49:boolean parseOption():238 -> s
     50:51:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    50:51:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):852 -> s
+    50:51:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868 -> s
     50:51:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     50:51:boolean parseOption():238 -> s
-    52:52:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):852:852 -> s
+    52:52:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868:868 -> s
     52:52:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     52:52:boolean parseOption():238 -> s
     53:54:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    53:54:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):852 -> s
+    53:54:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868 -> s
     53:54:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     53:54:boolean parseOption():238 -> s
-    55:58:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):852:855 -> s
+    55:58:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):868:871 -> s
     55:58:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     55:58:boolean parseOption():238 -> s
     59:59:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    59:59:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):856 -> s
+    59:59:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):872 -> s
     59:59:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     59:59:boolean parseOption():238 -> s
     60:70:com.android.tools.r8.shaking.ConstantArgumentRule com.android.tools.r8.shaking.ConstantArgumentRule$Builder.build():26:36 -> s
-    60:70:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):857 -> s
+    60:70:com.android.tools.r8.shaking.ConstantArgumentRule parseConstantArgumentRule(com.android.tools.r8.position.Position):873 -> s
     60:70:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):448 -> s
     60:70:boolean parseOption():238 -> s
     71:74:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):449:452 -> s
     71:74:boolean parseOption():238 -> s
     75:75:com.android.tools.r8.shaking.UnusedArgumentRule$Builder com.android.tools.r8.shaking.UnusedArgumentRule.builder():74:74 -> s
-    75:75:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):863 -> s
+    75:75:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879 -> s
     75:75:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     75:75:boolean parseOption():238 -> s
-    76:76:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):863:863 -> s
+    76:76:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879:879 -> s
     76:76:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     76:76:boolean parseOption():238 -> s
     77:78:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    77:78:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):863 -> s
+    77:78:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879 -> s
     77:78:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     77:78:boolean parseOption():238 -> s
-    79:79:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):863:863 -> s
+    79:79:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879:879 -> s
     79:79:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     79:79:boolean parseOption():238 -> s
     80:81:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    80:81:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):863 -> s
+    80:81:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879 -> s
     80:81:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     80:81:boolean parseOption():238 -> s
-    82:85:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):863:866 -> s
+    82:85:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):879:882 -> s
     82:85:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     82:85:boolean parseOption():238 -> s
     86:86:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    86:86:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):867 -> s
+    86:86:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):883 -> s
     86:86:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     86:86:boolean parseOption():238 -> s
     87:97:com.android.tools.r8.shaking.UnusedArgumentRule com.android.tools.r8.shaking.UnusedArgumentRule$Builder.build():26:36 -> s
-    87:97:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):868 -> s
+    87:97:com.android.tools.r8.shaking.UnusedArgumentRule parseUnusedArgumentRule(com.android.tools.r8.position.Position):884 -> s
     87:97:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):453 -> s
     87:97:boolean parseOption():238 -> s
     98:116:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):454:472 -> s
     98:116:boolean parseOption():238 -> s
-    117:117:com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder com.android.tools.r8.shaking.NoVerticalClassMergingRule.builder():76:76 -> s
-    117:117:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):757 -> s
+    117:117:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule.builder():76:76 -> s
+    117:117:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):762 -> s
     117:117:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     117:117:boolean parseOption():238 -> s
-    118:118:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):757:757 -> s
+    118:118:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):762:762 -> s
     118:118:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     118:118:boolean parseOption():238 -> s
     119:120:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    119:120:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):757 -> s
+    119:120:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):762 -> s
     119:120:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     119:120:boolean parseOption():238 -> s
-    121:121:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):757:757 -> s
+    121:121:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):762:762 -> s
     121:121:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     121:121:boolean parseOption():238 -> s
     122:123:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    122:123:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):757 -> s
+    122:123:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):762 -> s
     122:123:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     122:123:boolean parseOption():238 -> s
-    124:127:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):757:760 -> s
+    124:127:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):762:765 -> s
     124:127:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     124:127:boolean parseOption():238 -> s
     128:128:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    128:128:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):761 -> s
+    128:128:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):766 -> s
     128:128:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     128:128:boolean parseOption():238 -> s
-    129:139:com.android.tools.r8.shaking.NoVerticalClassMergingRule com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder.build():28:38 -> s
-    129:139:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):762 -> s
+    129:139:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule$Builder.build():28:38 -> s
+    129:139:com.android.tools.r8.shaking.NoUnusedInterfaceRemovalRule parseNoUnusedInterfaceRemovalRule(com.android.tools.r8.position.Position):767 -> s
     129:139:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):473 -> s
     129:139:boolean parseOption():238 -> s
     140:143:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):474:477 -> s
     140:143:boolean parseOption():238 -> s
-    144:144:com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder com.android.tools.r8.shaking.NoHorizontalClassMergingRule.builder():77:77 -> s
-    144:144:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):768 -> s
+    144:144:com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder com.android.tools.r8.shaking.NoVerticalClassMergingRule.builder():76:76 -> s
+    144:144:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):773 -> s
     144:144:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
     144:144:boolean parseOption():238 -> s
-    145:145:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):768:768 -> s
+    145:145:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):773:773 -> s
     145:145:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
     145:145:boolean parseOption():238 -> s
     146:147:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    146:147:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):768 -> s
+    146:147:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):773 -> s
     146:147:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
     146:147:boolean parseOption():238 -> s
-    148:148:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):768:768 -> s
+    148:148:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):773:773 -> s
     148:148:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
     148:148:boolean parseOption():238 -> s
     149:150:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    149:150:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):768 -> s
+    149:150:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):773 -> s
     149:150:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
     149:150:boolean parseOption():238 -> s
-    151:154:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):768:771 -> s
+    151:154:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):773:776 -> s
     151:154:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
     151:154:boolean parseOption():238 -> s
     155:155:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    155:155:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):772 -> s
+    155:155:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):777 -> s
     155:155:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
     155:155:boolean parseOption():238 -> s
-    156:156:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):773:773 -> s
-    156:156:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
-    156:156:boolean parseOption():238 -> s
-    157:160:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):479:482 -> s
-    157:160:boolean parseOption():238 -> s
-    161:161:com.android.tools.r8.shaking.NoStaticClassMergingRule$Builder com.android.tools.r8.shaking.NoStaticClassMergingRule.builder():76:76 -> s
-    161:161:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):779 -> s
-    161:161:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
-    161:161:boolean parseOption():238 -> s
-    162:162:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):779:779 -> s
-    162:162:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
-    162:162:boolean parseOption():238 -> s
-    163:164:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    163:164:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):779 -> s
-    163:164:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
-    163:164:boolean parseOption():238 -> s
-    165:165:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):779:779 -> s
-    165:165:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
-    165:165:boolean parseOption():238 -> s
-    166:167:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    166:167:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):779 -> s
-    166:167:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
-    166:167:boolean parseOption():238 -> s
-    168:171:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):779:782 -> s
-    168:171:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
-    168:171:boolean parseOption():238 -> s
-    172:172:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    172:172:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):783 -> s
+    156:166:com.android.tools.r8.shaking.NoVerticalClassMergingRule com.android.tools.r8.shaking.NoVerticalClassMergingRule$Builder.build():28:38 -> s
+    156:166:com.android.tools.r8.shaking.NoVerticalClassMergingRule parseNoVerticalClassMergingRule(com.android.tools.r8.position.Position):778 -> s
+    156:166:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):478 -> s
+    156:166:boolean parseOption():238 -> s
+    167:170:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):479:482 -> s
+    167:170:boolean parseOption():238 -> s
+    171:171:com.android.tools.r8.shaking.NoHorizontalClassMergingRule$Builder com.android.tools.r8.shaking.NoHorizontalClassMergingRule.builder():77:77 -> s
+    171:171:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):784 -> s
+    171:171:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
+    171:171:boolean parseOption():238 -> s
+    172:172:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):784:784 -> s
     172:172:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
     172:172:boolean parseOption():238 -> s
-    173:183:com.android.tools.r8.shaking.NoStaticClassMergingRule com.android.tools.r8.shaking.NoStaticClassMergingRule$Builder.build():28:38 -> s
-    173:183:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):784 -> s
-    173:183:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
-    173:183:boolean parseOption():238 -> s
-    184:188:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):484:488 -> s
-    184:188:boolean parseOption():238 -> s
-    189:189:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule.builder():91:91 -> s
-    189:189:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):791 -> s
-    189:189:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
+    173:174:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    173:174:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):784 -> s
+    173:174:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
+    173:174:boolean parseOption():238 -> s
+    175:175:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):784:784 -> s
+    175:175:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
+    175:175:boolean parseOption():238 -> s
+    176:177:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    176:177:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):784 -> s
+    176:177:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
+    176:177:boolean parseOption():238 -> s
+    178:181:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):784:787 -> s
+    178:181:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
+    178:181:boolean parseOption():238 -> s
+    182:182:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    182:182:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):788 -> s
+    182:182:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
+    182:182:boolean parseOption():238 -> s
+    183:183:com.android.tools.r8.shaking.NoHorizontalClassMergingRule parseNoHorizontalClassMergingRule(com.android.tools.r8.position.Position):789:789 -> s
+    183:183:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):483 -> s
+    183:183:boolean parseOption():238 -> s
+    184:187:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):484:487 -> s
+    184:187:boolean parseOption():238 -> s
+    188:188:com.android.tools.r8.shaking.NoStaticClassMergingRule$Builder com.android.tools.r8.shaking.NoStaticClassMergingRule.builder():76:76 -> s
+    188:188:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):795 -> s
+    188:188:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    188:188:boolean parseOption():238 -> s
+    189:189:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):795:795 -> s
+    189:189:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
     189:189:boolean parseOption():238 -> s
-    190:190:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):791:791 -> s
-    190:190:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    190:190:boolean parseOption():238 -> s
-    191:192:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    191:192:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):791 -> s
-    191:192:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    191:192:boolean parseOption():238 -> s
-    193:193:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):791:791 -> s
-    193:193:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    193:193:boolean parseOption():238 -> s
-    194:195:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    194:195:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):791 -> s
-    194:195:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    194:195:boolean parseOption():238 -> s
-    196:196:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):791:791 -> s
-    196:196:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    196:196:boolean parseOption():238 -> s
-    197:197:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> s
-    197:197:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):791 -> s
-    197:197:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    197:197:boolean parseOption():238 -> s
-    198:200:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):792:794 -> s
-    198:200:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    198:200:boolean parseOption():238 -> s
-    201:201:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    201:201:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):795 -> s
-    201:201:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    201:201:boolean parseOption():238 -> s
-    202:212:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:48 -> s
-    202:212:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):796 -> s
-    202:212:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489 -> s
-    202:212:boolean parseOption():238 -> s
-    213:218:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):490:495 -> s
-    213:218:boolean parseOption():238 -> s
-    219:226:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494:501 -> s
-    219:226:boolean parseOption():238 -> s
-    227:233:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):500:506 -> s
-    227:233:boolean parseOption():238 -> s
-    234:241:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505:512 -> s
-    234:241:boolean parseOption():238 -> s
-    242:246:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):511:515 -> s
-    242:246:boolean parseOption():238 -> s
-    247:247:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder com.android.tools.r8.shaking.WhyAreYouNotInliningRule.builder():74:74 -> s
-    247:247:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):897 -> s
-    247:247:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    247:247:boolean parseOption():238 -> s
-    248:248:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):897:897 -> s
-    248:248:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    248:248:boolean parseOption():238 -> s
-    249:250:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    249:250:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):897 -> s
-    249:250:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    249:250:boolean parseOption():238 -> s
-    251:251:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):897:897 -> s
-    251:251:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    251:251:boolean parseOption():238 -> s
-    252:253:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    252:253:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):897 -> s
-    252:253:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    252:253:boolean parseOption():238 -> s
-    254:257:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):897:900 -> s
-    254:257:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    254:257:boolean parseOption():238 -> s
-    258:258:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    258:258:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):901 -> s
-    258:258:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    258:258:boolean parseOption():238 -> s
-    259:269:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:36 -> s
-    259:269:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):902 -> s
-    259:269:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516 -> s
-    259:269:boolean parseOption():238 -> s
-    270:270:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):517:517 -> s
-    270:270:boolean parseOption():238 -> s
-    271:278:boolean parseOption():239:246 -> s
-    279:291:boolean parseOption():242:254 -> s
-    292:319:java.util.List acceptPatternList():1873:1900 -> s
-    292:319:void parseKeepAttributes():602 -> s
-    292:319:boolean parseOption():255 -> s
-    320:323:void parseKeepAttributes():603:606 -> s
-    320:323:boolean parseOption():255 -> s
-    324:324:void parseKeepAttributes():604:604 -> s
-    324:324:boolean parseOption():255 -> s
-    325:326:boolean parseOption():256:257 -> s
-    327:336:void parsePackageFilter(java.util.function.BiConsumer):1942:1951 -> s
-    327:336:boolean parseOption():257 -> s
-    337:340:void parsePackageFilter(java.util.function.BiConsumer):1950:1953 -> s
-    337:340:boolean parseOption():257 -> s
-    341:348:void parsePackageFilter(java.util.function.BiConsumer):1948:1955 -> s
-    341:348:boolean parseOption():257 -> s
-    349:363:boolean parseOption():258:272 -> s
-    364:364:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> s
-    364:364:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):721 -> s
-    364:364:boolean parseOption():273 -> s
-    365:365:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):721:721 -> s
-    365:365:boolean parseOption():273 -> s
-    366:367:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    366:367:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):722 -> s
-    366:367:boolean parseOption():273 -> s
-    368:368:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):722:722 -> s
-    368:368:boolean parseOption():273 -> s
-    369:370:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    369:370:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):723 -> s
-    369:370:boolean parseOption():273 -> s
-    371:374:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):723:726 -> s
-    371:374:boolean parseOption():273 -> s
-    375:375:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    375:375:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):727 -> s
-    375:375:boolean parseOption():273 -> s
-    376:386:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> s
-    376:386:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):728 -> s
-    376:386:boolean parseOption():273 -> s
-    387:397:boolean parseOption():274:284 -> s
-    398:400:boolean parseOption():281:281 -> s
-    404:479:boolean parseOption():285:360 -> s
-    480:480:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> s
-    480:480:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1525 -> s
-    480:480:boolean parseOption():361 -> s
-    481:481:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1525:1525 -> s
-    481:481:boolean parseOption():361 -> s
-    482:483:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    482:483:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1526 -> s
-    482:483:boolean parseOption():361 -> s
-    484:484:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1526:1526 -> s
-    484:484:boolean parseOption():361 -> s
-    485:486:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    485:486:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1527 -> s
-    485:486:boolean parseOption():361 -> s
-    487:490:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1527:1530 -> s
-    487:490:boolean parseOption():361 -> s
-    491:491:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    491:491:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1531 -> s
-    491:491:boolean parseOption():361 -> s
-    492:492:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1532:1532 -> s
-    492:492:boolean parseOption():361 -> s
-    493:494:boolean parseOption():362:363 -> s
-    495:495:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> s
-    495:495:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1548 -> s
-    495:495:boolean parseOption():364 -> s
-    496:496:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1548:1548 -> s
-    496:496:boolean parseOption():364 -> s
-    497:498:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    497:498:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1549 -> s
-    497:498:boolean parseOption():364 -> s
-    499:499:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1549:1549 -> s
-    499:499:boolean parseOption():364 -> s
-    500:501:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    500:501:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1550 -> s
-    500:501:boolean parseOption():364 -> s
-    502:505:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1550:1553 -> s
-    502:505:boolean parseOption():364 -> s
-    506:506:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    506:506:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1554 -> s
-    506:506:boolean parseOption():364 -> s
-    507:517:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> s
-    507:517:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1555 -> s
-    507:517:boolean parseOption():364 -> s
-    518:522:boolean parseOption():365:369 -> s
-    523:557:boolean parseOption():368:402 -> s
-    558:558:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> s
-    558:558:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):815 -> s
-    558:558:boolean parseOption():402 -> s
-    559:559:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):815:815 -> s
-    559:559:boolean parseOption():402 -> s
-    560:561:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    560:561:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):816 -> s
-    560:561:boolean parseOption():402 -> s
-    562:562:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):816:816 -> s
-    562:562:boolean parseOption():402 -> s
-    563:564:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    563:564:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):817 -> s
-    563:564:boolean parseOption():402 -> s
-    565:568:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):817:820 -> s
-    565:568:boolean parseOption():402 -> s
-    569:569:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    569:569:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):821 -> s
-    569:569:boolean parseOption():402 -> s
-    570:580:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> s
-    570:580:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):822 -> s
-    570:580:boolean parseOption():402 -> s
-    581:583:boolean parseOption():402:404 -> s
-    584:584:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():121:121 -> s
-    584:584:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):827 -> s
-    584:584:boolean parseOption():404 -> s
-    585:585:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):827:827 -> s
-    585:585:boolean parseOption():404 -> s
-    586:587:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
-    586:587:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):828 -> s
-    586:587:boolean parseOption():404 -> s
-    588:588:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):828:828 -> s
-    588:588:boolean parseOption():404 -> s
-    589:590:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
-    589:590:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):829 -> s
-    589:590:boolean parseOption():404 -> s
-    591:598:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):829:836 -> s
-    591:598:boolean parseOption():404 -> s
-    599:599:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):59:59 -> s
-    599:599:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):837 -> s
-    599:599:boolean parseOption():404 -> s
-    600:601:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):838:839 -> s
-    600:601:boolean parseOption():404 -> s
-    602:602:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
-    602:602:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):840 -> s
-    602:602:boolean parseOption():404 -> s
-    603:614:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():64:75 -> s
-    603:614:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):841 -> s
-    603:614:boolean parseOption():404 -> s
-    615:615:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):842:842 -> s
+    190:191:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    190:191:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):795 -> s
+    190:191:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    190:191:boolean parseOption():238 -> s
+    192:192:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):795:795 -> s
+    192:192:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    192:192:boolean parseOption():238 -> s
+    193:194:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    193:194:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):795 -> s
+    193:194:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    193:194:boolean parseOption():238 -> s
+    195:198:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):795:798 -> s
+    195:198:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    195:198:boolean parseOption():238 -> s
+    199:199:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    199:199:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):799 -> s
+    199:199:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    199:199:boolean parseOption():238 -> s
+    200:210:com.android.tools.r8.shaking.NoStaticClassMergingRule com.android.tools.r8.shaking.NoStaticClassMergingRule$Builder.build():28:38 -> s
+    200:210:com.android.tools.r8.shaking.NoStaticClassMergingRule parseNoStaticClassMergingRule(com.android.tools.r8.position.Position):800 -> s
+    200:210:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):488 -> s
+    200:210:boolean parseOption():238 -> s
+    211:215:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):489:493 -> s
+    211:215:boolean parseOption():238 -> s
+    216:216:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule.builder():91:91 -> s
+    216:216:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> s
+    216:216:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    216:216:boolean parseOption():238 -> s
+    217:217:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807:807 -> s
+    217:217:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    217:217:boolean parseOption():238 -> s
+    218:219:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    218:219:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> s
+    218:219:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    218:219:boolean parseOption():238 -> s
+    220:220:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807:807 -> s
+    220:220:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    220:220:boolean parseOption():238 -> s
+    221:222:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    221:222:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> s
+    221:222:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    221:222:boolean parseOption():238 -> s
+    223:223:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807:807 -> s
+    223:223:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    223:223:boolean parseOption():238 -> s
+    224:224:com.android.tools.r8.shaking.MemberValuePropagationRule$Builder com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.setType(com.android.tools.r8.shaking.MemberValuePropagationRule$Type):32:32 -> s
+    224:224:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):807 -> s
+    224:224:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    224:224:boolean parseOption():238 -> s
+    225:227:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):808:810 -> s
+    225:227:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    225:227:boolean parseOption():238 -> s
+    228:228:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    228:228:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):811 -> s
+    228:228:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    228:228:boolean parseOption():238 -> s
+    229:239:com.android.tools.r8.shaking.MemberValuePropagationRule com.android.tools.r8.shaking.MemberValuePropagationRule$Builder.build():38:48 -> s
+    229:239:com.android.tools.r8.shaking.MemberValuePropagationRule parseMemberValuePropagationRule(com.android.tools.r8.shaking.MemberValuePropagationRule$Type,com.android.tools.r8.position.Position):812 -> s
+    229:239:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):494 -> s
+    229:239:boolean parseOption():238 -> s
+    240:245:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):495:500 -> s
+    240:245:boolean parseOption():238 -> s
+    246:253:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):499:506 -> s
+    246:253:boolean parseOption():238 -> s
+    254:260:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):505:511 -> s
+    254:260:boolean parseOption():238 -> s
+    261:268:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):510:517 -> s
+    261:268:boolean parseOption():238 -> s
+    269:273:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):516:520 -> s
+    269:273:boolean parseOption():238 -> s
+    274:274:com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder com.android.tools.r8.shaking.WhyAreYouNotInliningRule.builder():74:74 -> s
+    274:274:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913 -> s
+    274:274:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    274:274:boolean parseOption():238 -> s
+    275:275:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913:913 -> s
+    275:275:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    275:275:boolean parseOption():238 -> s
+    276:277:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    276:277:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913 -> s
+    276:277:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    276:277:boolean parseOption():238 -> s
+    278:278:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913:913 -> s
+    278:278:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    278:278:boolean parseOption():238 -> s
+    279:280:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    279:280:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913 -> s
+    279:280:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    279:280:boolean parseOption():238 -> s
+    281:284:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):913:916 -> s
+    281:284:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    281:284:boolean parseOption():238 -> s
+    285:285:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    285:285:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):917 -> s
+    285:285:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    285:285:boolean parseOption():238 -> s
+    286:296:com.android.tools.r8.shaking.WhyAreYouNotInliningRule com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder.build():26:36 -> s
+    286:296:com.android.tools.r8.shaking.WhyAreYouNotInliningRule parseWhyAreYouNotInliningRule(com.android.tools.r8.position.Position):918 -> s
+    286:296:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):521 -> s
+    286:296:boolean parseOption():238 -> s
+    297:297:boolean parseTestingOption(com.android.tools.r8.position.TextPosition):522:522 -> s
+    297:297:boolean parseOption():238 -> s
+    298:305:boolean parseOption():239:246 -> s
+    306:318:boolean parseOption():242:254 -> s
+    319:346:java.util.List acceptPatternList():1889:1916 -> s
+    319:346:void parseKeepAttributes():607 -> s
+    319:346:boolean parseOption():255 -> s
+    347:350:void parseKeepAttributes():608:611 -> s
+    347:350:boolean parseOption():255 -> s
+    351:351:void parseKeepAttributes():609:609 -> s
+    351:351:boolean parseOption():255 -> s
+    352:353:boolean parseOption():256:257 -> s
+    354:363:void parsePackageFilter(java.util.function.BiConsumer):1958:1967 -> s
+    354:363:boolean parseOption():257 -> s
+    364:367:void parsePackageFilter(java.util.function.BiConsumer):1966:1969 -> s
+    364:367:boolean parseOption():257 -> s
+    368:375:void parsePackageFilter(java.util.function.BiConsumer):1964:1971 -> s
+    368:375:boolean parseOption():257 -> s
+    376:390:boolean parseOption():258:272 -> s
+    391:391:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule.builder():74:74 -> s
+    391:391:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):726 -> s
+    391:391:boolean parseOption():273 -> s
+    392:392:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):726:726 -> s
+    392:392:boolean parseOption():273 -> s
+    393:394:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    393:394:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):727 -> s
+    393:394:boolean parseOption():273 -> s
+    395:395:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):727:727 -> s
+    395:395:boolean parseOption():273 -> s
+    396:397:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    396:397:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):728 -> s
+    396:397:boolean parseOption():273 -> s
+    398:401:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):728:731 -> s
+    398:401:boolean parseOption():273 -> s
+    402:402:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    402:402:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):732 -> s
+    402:402:boolean parseOption():273 -> s
+    403:413:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder.build():26:36 -> s
+    403:413:com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule parseWhyAreYouKeepingRule(com.android.tools.r8.position.Position):733 -> s
+    403:413:boolean parseOption():273 -> s
+    414:424:boolean parseOption():274:284 -> s
+    425:427:boolean parseOption():281:281 -> s
+    431:506:boolean parseOption():285:360 -> s
+    507:507:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule$Builder com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule.builder():77:77 -> s
+    507:507:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1541 -> s
+    507:507:boolean parseOption():361 -> s
+    508:508:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1541:1541 -> s
+    508:508:boolean parseOption():361 -> s
+    509:510:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    509:510:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1542 -> s
+    509:510:boolean parseOption():361 -> s
+    511:511:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1542:1542 -> s
+    511:511:boolean parseOption():361 -> s
+    512:513:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    512:513:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1543 -> s
+    512:513:boolean parseOption():361 -> s
+    514:517:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1543:1546 -> s
+    514:517:boolean parseOption():361 -> s
+    518:518:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    518:518:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1547 -> s
+    518:518:boolean parseOption():361 -> s
+    519:519:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule parseAssumeNoSideEffectsRule(com.android.tools.r8.position.Position):1548:1548 -> s
+    519:519:boolean parseOption():361 -> s
+    520:521:boolean parseOption():362:363 -> s
+    522:522:com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder com.android.tools.r8.shaking.ProguardAssumeValuesRule.builder():77:77 -> s
+    522:522:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1564 -> s
+    522:522:boolean parseOption():364 -> s
+    523:523:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1564:1564 -> s
+    523:523:boolean parseOption():364 -> s
+    524:525:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    524:525:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1565 -> s
+    524:525:boolean parseOption():364 -> s
+    526:526:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1565:1565 -> s
+    526:526:boolean parseOption():364 -> s
+    527:528:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    527:528:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1566 -> s
+    527:528:boolean parseOption():364 -> s
+    529:532:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1566:1569 -> s
+    529:532:boolean parseOption():364 -> s
+    533:533:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    533:533:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1570 -> s
+    533:533:boolean parseOption():364 -> s
+    534:544:com.android.tools.r8.shaking.ProguardAssumeValuesRule com.android.tools.r8.shaking.ProguardAssumeValuesRule$Builder.build():26:36 -> s
+    534:544:com.android.tools.r8.shaking.ProguardAssumeValuesRule parseAssumeValuesRule(com.android.tools.r8.position.Position):1571 -> s
+    534:544:boolean parseOption():364 -> s
+    545:549:boolean parseOption():365:369 -> s
+    550:584:boolean parseOption():368:402 -> s
+    585:585:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder com.android.tools.r8.shaking.ProguardIdentifierNameStringRule.builder():73:73 -> s
+    585:585:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):831 -> s
+    585:585:boolean parseOption():402 -> s
+    586:586:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):831:831 -> s
+    586:586:boolean parseOption():402 -> s
+    587:588:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    587:588:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):832 -> s
+    587:588:boolean parseOption():402 -> s
+    589:589:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):832:832 -> s
+    589:589:boolean parseOption():402 -> s
+    590:591:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    590:591:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):833 -> s
+    590:591:boolean parseOption():402 -> s
+    592:595:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):833:836 -> s
+    592:595:boolean parseOption():402 -> s
+    596:596:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    596:596:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):837 -> s
+    596:596:boolean parseOption():402 -> s
+    597:607:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder.build():25:35 -> s
+    597:607:com.android.tools.r8.shaking.ProguardIdentifierNameStringRule parseIdentifierNameStringRule(com.android.tools.r8.position.Position):838 -> s
+    597:607:boolean parseOption():402 -> s
+    608:610:boolean parseOption():402:404 -> s
+    611:611:com.android.tools.r8.shaking.ProguardIfRule$Builder com.android.tools.r8.shaking.ProguardIfRule.builder():121:121 -> s
+    611:611:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):843 -> s
+    611:611:boolean parseOption():404 -> s
+    612:612:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):843:843 -> s
+    612:612:boolean parseOption():404 -> s
+    613:614:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setOrigin(com.android.tools.r8.origin.Origin):53:54 -> s
+    613:614:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):844 -> s
+    613:614:boolean parseOption():404 -> s
+    615:615:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):844:844 -> s
     615:615:boolean parseOption():404 -> s
-    616:628:void verifyAndLinkBackReferences(java.lang.Iterable):906:918 -> s
-    616:628:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):842 -> s
-    616:628:boolean parseOption():404 -> s
-    629:633:void verifyAndLinkBackReferences(java.lang.Iterable):913:913 -> s
-    629:633:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):842 -> s
-    629:633:boolean parseOption():404 -> s
-    640:642:void verifyAndLinkBackReferences(java.lang.Iterable):920:922 -> s
-    640:642:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):842 -> s
-    640:642:boolean parseOption():404 -> s
-    643:643:boolean parseOption():404:404 -> s
-    644:646:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):845:845 -> s
-    644:646:boolean parseOption():404 -> s
-    647:667:boolean parseOption():405:425 -> s
-    1:1:java.lang.String acceptClassName():1716:1716 -> t
-    1:1:java.lang.String parsePackageNameOrEmptyString():1988 -> t
-    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2023:2042 -> u
-    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2039:2044 -> u
-    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2029:2029 -> u
-    1:1:char peekChar():1642:1642 -> v
-    1:11:void skipOptimizationName():675:685 -> w
-    1:2:void skipSingleArgument():690:691 -> x
-    3:3:char readChar():1651:1651 -> x
-    3:3:void skipSingleArgument():692 -> x
-    1:6:void skipWhitespace():1559:1564 -> y
-    7:14:void skipComment():1570:1577 -> y
-    7:14:void skipWhitespace():1566 -> y
-com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.U0:
+    616:617:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setStart(com.android.tools.r8.position.Position):58:59 -> s
+    616:617:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):845 -> s
+    616:617:boolean parseOption():404 -> s
+    618:625:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):845:852 -> s
+    618:625:boolean parseOption():404 -> s
+    626:626:void com.android.tools.r8.shaking.ProguardIfRule$Builder.setSubsequentRule(com.android.tools.r8.shaking.ProguardKeepRule):59:59 -> s
+    626:626:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):853 -> s
+    626:626:boolean parseOption():404 -> s
+    627:628:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):854:855 -> s
+    627:628:boolean parseOption():404 -> s
+    629:629:com.android.tools.r8.shaking.ProguardClassSpecification$Builder com.android.tools.r8.shaking.ProguardClassSpecification$Builder.setEnd(com.android.tools.r8.position.Position):63:63 -> s
+    629:629:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):856 -> s
+    629:629:boolean parseOption():404 -> s
+    630:641:com.android.tools.r8.shaking.ProguardIfRule com.android.tools.r8.shaking.ProguardIfRule$Builder.build():64:75 -> s
+    630:641:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):857 -> s
+    630:641:boolean parseOption():404 -> s
+    642:642:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858:858 -> s
+    642:642:boolean parseOption():404 -> s
+    643:655:void verifyAndLinkBackReferences(java.lang.Iterable):922:934 -> s
+    643:655:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858 -> s
+    643:655:boolean parseOption():404 -> s
+    656:660:void verifyAndLinkBackReferences(java.lang.Iterable):929:929 -> s
+    656:660:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858 -> s
+    656:660:boolean parseOption():404 -> s
+    667:669:void verifyAndLinkBackReferences(java.lang.Iterable):936:938 -> s
+    667:669:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):858 -> s
+    667:669:boolean parseOption():404 -> s
+    670:670:boolean parseOption():404:404 -> s
+    671:673:com.android.tools.r8.shaking.ProguardIfRule parseIfRule(com.android.tools.r8.position.TextPosition):861:861 -> s
+    671:673:boolean parseOption():404 -> s
+    674:694:boolean parseOption():405:425 -> s
+    1:1:java.lang.String acceptClassName():1732:1732 -> t
+    1:1:java.lang.String parsePackageNameOrEmptyString():2004 -> t
+    1:20:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2039:2058 -> u
+    21:26:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2055:2060 -> u
+    27:27:com.android.tools.r8.shaking.ProguardPathList parsePathFilter():2045:2045 -> u
+    1:1:char peekChar():1658:1658 -> v
+    1:11:void skipOptimizationName():680:690 -> w
+    1:2:void skipSingleArgument():695:696 -> x
+    3:3:char readChar():1667:1667 -> x
+    3:3:void skipSingleArgument():697 -> x
+    1:6:void skipWhitespace():1575:1580 -> y
+    7:14:void skipComment():1586:1593 -> y
+    7:14:void skipWhitespace():1582 -> y
+com.android.tools.r8.shaking.ProguardConfigurationRule -> com.android.tools.r8.shaking.X0:
     boolean $assertionsDisabled -> o
     boolean used -> p
     1:1:void <clinit>():22:22 -> <clinit>
@@ -73936,7 +74468,7 @@
     2:2:boolean com.android.tools.r8.shaking.ProguardTypeMatcher.hasSpecificType():0:0 -> a
     2:2:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):108 -> a
     3:6:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):109:112 -> a
-    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    7:7:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     7:7:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):113 -> a
     8:11:java.lang.Iterable relevantCandidatesForRule(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):114:117 -> a
     12:12:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> a
@@ -73959,9 +74491,9 @@
     1:1:boolean isUsed():57:57 -> x
     1:1:void markAsUsed():61:61 -> y
     java.lang.String modifierString() -> z
-com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.qt:
+com.android.tools.r8.shaking.ProguardConfigurationSource -> com.android.tools.r8.internal.Lt:
     java.nio.file.Path getBaseDirectory() -> a
-com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.rt:
+com.android.tools.r8.shaking.ProguardConfigurationSourceBytes -> com.android.tools.r8.internal.Mt:
     byte[] bytes -> a
     com.android.tools.r8.origin.Origin origin -> b
     1:3:void <init>(byte[],com.android.tools.r8.origin.Origin):18:20 -> <init>
@@ -73969,14 +74501,14 @@
     1:1:java.lang.String get():29:29 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.st:
+com.android.tools.r8.shaking.ProguardConfigurationSourceFile -> com.android.tools.r8.internal.Nt:
     java.nio.file.Path path -> a
     1:2:void <init>(java.nio.file.Path):18:19 -> <init>
     1:5:java.nio.file.Path getBaseDirectory():29:33 -> a
     1:1:java.lang.String get():24:24 -> get
     1:1:java.lang.String getName():40:40 -> getName
     1:1:com.android.tools.r8.origin.Origin getOrigin():45:45 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.tt:
+com.android.tools.r8.shaking.ProguardConfigurationSourceStrings -> com.android.tools.r8.internal.Ot:
     java.util.List config -> b
     com.android.tools.r8.origin.Origin origin -> c
     java.nio.file.Path basePath -> a
@@ -73987,7 +74519,7 @@
     3:3:java.nio.file.Path getBaseDirectory():47:47 -> a
     1:1:java.lang.String get():42:42 -> get
     1:1:com.android.tools.r8.origin.Origin getOrigin():57:57 -> getOrigin
-com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.Y0:
+com.android.tools.r8.shaking.ProguardConfigurationUtils -> com.android.tools.r8.shaking.b1:
     com.android.tools.r8.origin.Origin synthesizedRecompilationOrigin -> a
     1:12:void <clinit>():19:30 -> <clinit>
     1:12:com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule buildAssumeNoSideEffectsRuleForApiLevel(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.AndroidApiLevel):90:101 -> a
@@ -74013,25 +74545,25 @@
     102:102:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):184 -> a
     103:104:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):188:189 -> a
     105:105:void synthesizeKeepRulesForRecompilation(com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.List):180:180 -> a
-com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.V0:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$1 -> com.android.tools.r8.shaking.Y0:
     1:1:void <init>(com.android.tools.r8.origin.Origin):22:22 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.shaking.W0:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$2 -> com.android.tools.r8.shaking.Z0:
     1:1:void <init>(com.android.tools.r8.origin.Origin):30:30 -> <init>
-com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.shaking.X0:
+com.android.tools.r8.shaking.ProguardConfigurationUtils$3 -> com.android.tools.r8.shaking.a1:
     com.android.tools.r8.utils.AndroidApiLevel val$apiLevel -> e
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.utils.AndroidApiLevel):91:91 -> <init>
     1:1:java.lang.String part():94:94 -> part
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.b1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule -> com.android.tools.r8.shaking.e1:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):56:56 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.shaking.Z0:
-com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.a1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1 -> com.android.tools.r8.shaking.c1:
+com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$Builder -> com.android.tools.r8.shaking.d1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardIdentifierNameStringRule$1):12:12 -> <init>
     2:2:void <init>():15:15 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.c1:
+com.android.tools.r8.shaking.ProguardIfRule -> com.android.tools.r8.shaking.f1:
     com.android.tools.r8.origin.Origin NEVER_INLINE_ORIGIN -> s
     com.android.tools.r8.origin.Origin NO_HORIZONTAL_CLASS_MERGING_ORIGIN -> t
     java.util.Set preconditions -> v
@@ -74085,18 +74617,18 @@
     1:1:java.lang.Iterable getWildcards():126:126 -> v
     2:2:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> v
     2:2:java.lang.Iterable getWildcards():126 -> v
-com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.c1$a:
+com.android.tools.r8.shaking.ProguardIfRule$1 -> com.android.tools.r8.shaking.f1$a:
     1:1:void <init>(com.android.tools.r8.origin.Origin):19:19 -> <init>
-com.android.tools.r8.shaking.ProguardIfRule$2 -> com.android.tools.r8.shaking.c1$b:
+com.android.tools.r8.shaking.ProguardIfRule$2 -> com.android.tools.r8.shaking.f1$b:
     1:1:void <init>(com.android.tools.r8.origin.Origin):27:27 -> <init>
-com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.c1$c:
+com.android.tools.r8.shaking.ProguardIfRule$Builder -> com.android.tools.r8.shaking.f1$c:
     com.android.tools.r8.shaking.ProguardKeepRule subsequentRule -> s
     boolean $assertionsDisabled -> r
     1:1:void <clinit>():45:45 -> <clinit>
     1:1:void <init>():50:50 -> <init>
     2:2:void <init>():47:47 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.ut:
+com.android.tools.r8.shaking.ProguardKeepAttributes -> com.android.tools.r8.internal.Pt:
     boolean runtimeVisibleAnnotations -> m
     boolean runtimeInvisibleAnnotations -> n
     boolean runtimeVisibleParameterAnnotations -> o
@@ -74129,7 +74661,7 @@
     1:5:boolean equals(java.lang.Object):176:180 -> equals
     1:16:int hashCode():200:215 -> hashCode
     1:1:java.lang.String toString():298:298 -> toString
-com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.d1:
+com.android.tools.r8.shaking.ProguardKeepRule -> com.android.tools.r8.shaking.g1:
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):63:63 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardKeepRule$Builder builder():85:85 -> D
     1:22:com.android.tools.r8.shaking.ProguardKeepRule materialize(com.android.tools.r8.graph.DexItemFactory):89:110 -> a
@@ -74157,13 +74689,13 @@
     46:49:com.android.tools.r8.shaking.ProguardKeepRule defaultKeepAllRule(java.util.function.Consumer):151:154 -> a
     1:5:boolean equals(java.lang.Object):115:119 -> equals
     com.android.tools.r8.shaking.ProguardKeepRule asProguardKeepRule() -> s
-com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.d1$a:
+com.android.tools.r8.shaking.ProguardKeepRule$1 -> com.android.tools.r8.shaking.g1$a:
     1:1:void <init>(com.android.tools.r8.origin.Origin):142:142 -> <init>
-com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.shaking.d1$b:
+com.android.tools.r8.shaking.ProguardKeepRule$Builder -> com.android.tools.r8.shaking.g1$b:
     1:1:void <init>():18:18 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
     1:16:com.android.tools.r8.shaking.ProguardKeepRule build():28:43 -> e
-com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.shaking.e1:
+com.android.tools.r8.shaking.ProguardKeepRuleBase -> com.android.tools.r8.shaking.h1:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers modifiers -> r
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> q
     1:16:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardKeepRuleType,com.android.tools.r8.shaking.ProguardKeepRuleModifiers):58:73 -> <init>
@@ -74173,13 +74705,13 @@
     1:12:boolean equals(java.lang.Object):86:97 -> equals
     1:3:int hashCode():103:105 -> hashCode
     1:1:java.lang.String modifierString():132:132 -> z
-com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.shaking.e1$a:
+com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder -> com.android.tools.r8.shaking.h1$a:
     com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder modifiersBuilder -> q
     com.android.tools.r8.shaking.ProguardKeepRuleType type -> p
     1:1:void <init>():21:21 -> <init>
     2:2:void <init>():18:18 -> <init>
     1:2:com.android.tools.r8.shaking.ProguardKeepRuleBase$Builder setType(com.android.tools.r8.shaking.ProguardKeepRuleType):25:26 -> a
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.shaking.f1:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers -> com.android.tools.r8.shaking.i1:
     boolean includeDescriptorClasses -> e
     boolean allowsAccessModification -> a
     boolean allowsShrinking -> b
@@ -74192,8 +74724,8 @@
     1:5:boolean equals(java.lang.Object):77:81 -> equals
     1:5:int hashCode():90:94 -> hashCode
     1:7:java.lang.String toString():99:105 -> toString
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.shaking.f1$a:
-com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.f1$b:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$1 -> com.android.tools.r8.shaking.i1$a:
+com.android.tools.r8.shaking.ProguardKeepRuleModifiers$Builder -> com.android.tools.r8.shaking.i1$b:
     boolean includeDescriptorClasses -> e
     boolean allowsAccessModification -> a
     boolean allowsShrinking -> b
@@ -74208,7 +74740,7 @@
     1:1:void setAllowsOptimization(boolean):27:27 -> c
     1:1:void setAllowsShrinking(boolean):23:23 -> d
     1:1:void setIncludeDescriptorClasses(boolean):36:36 -> e
-com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.vt:
+com.android.tools.r8.shaking.ProguardKeepRuleType -> com.android.tools.r8.internal.Qt:
     com.android.tools.r8.shaking.ProguardKeepRuleType[] $VALUES -> e
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASS_MEMBERS -> b
     com.android.tools.r8.shaking.ProguardKeepRuleType KEEP_CLASSES_WITH_MEMBERS -> c
@@ -74218,7 +74750,7 @@
     5:5:void <clinit>():8:8 -> <clinit>
     1:1:void <init>(java.lang.String,int):8:8 -> <init>
     1:11:java.lang.String toString():16:26 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.g1:
+com.android.tools.r8.shaking.ProguardMemberRule -> com.android.tools.r8.shaking.j1:
     com.android.tools.r8.shaking.ProguardNameMatcher name -> f
     java.util.List annotations -> a
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> d
@@ -74257,8 +74789,8 @@
     40:49:java.lang.String toString():409:418 -> toString
     50:68:java.lang.String toString():406:424 -> toString
     69:103:java.lang.String toString():403:437 -> toString
-com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.g1$a:
-com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.g1$b:
+com.android.tools.r8.shaking.ProguardMemberRule$1 -> com.android.tools.r8.shaking.j1$a:
+com.android.tools.r8.shaking.ProguardMemberRule$Builder -> com.android.tools.r8.shaking.j1$b:
     java.util.List annotations -> b
     com.android.tools.r8.shaking.ProguardNameMatcher name -> g
     com.android.tools.r8.shaking.ProguardMemberType ruleType -> e
@@ -74284,7 +74816,7 @@
     1:1:com.android.tools.r8.shaking.ProguardAccessFlags getNegatedAccessFlags():53:53 -> c
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher getTypeMatcher():66:66 -> d
     1:1:boolean isValid():90:90 -> e
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.shaking.h1:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue -> com.android.tools.r8.shaking.k1:
     com.android.tools.r8.utils.LongInterval longInterval -> d
     com.android.tools.r8.graph.DexField field -> e
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type type -> b
@@ -74305,14 +74837,14 @@
     1:1:boolean isSingleValue():78:78 -> h
     1:1:boolean isValueRange():56:56 -> i
     1:17:java.lang.String toString():111:127 -> toString
-com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.shaking.h1$a:
+com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type -> com.android.tools.r8.shaking.k1$a:
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type BOOLEAN -> a
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type FIELD -> c
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type VALUE_RANGE -> b
     com.android.tools.r8.shaking.ProguardMemberRuleReturnValue$Type NULL -> d
     1:4:void <clinit>():12:15 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.xt:
+com.android.tools.r8.shaking.ProguardMemberType -> com.android.tools.r8.internal.St:
     com.android.tools.r8.shaking.ProguardMemberType METHOD -> h
     com.android.tools.r8.shaking.ProguardMemberType CONSTRUCTOR -> g
     com.android.tools.r8.shaking.ProguardMemberType INIT -> f
@@ -74327,7 +74859,7 @@
     1:1:void <init>(java.lang.String,int):6:6 -> <init>
     1:1:boolean includesFields():18:18 -> a
     1:1:boolean includesMethods():22:22 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.shaking.i1:
+com.android.tools.r8.shaking.ProguardNameMatcher -> com.android.tools.r8.shaking.l1:
     boolean $assertionsDisabled -> b
     com.android.tools.r8.shaking.ProguardNameMatcher MATCH_ALL_NAMES -> a
     1:3:void <clinit>():14:16 -> <clinit>
@@ -74337,15 +74869,15 @@
     1:1:boolean access$100(java.lang.String,int,java.lang.String,int,java.util.List,int):14:14 -> a
     2:2:java.lang.Iterable getWildcards():93:93 -> a
     3:3:java.lang.Iterable getWildcardsOrEmpty(com.android.tools.r8.shaking.ProguardNameMatcher):97:97 -> a
-    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2170:2170 -> a
+    4:4:boolean com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards.isMatchAllNames():2186:2186 -> a
     4:4:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):23 -> a
     5:9:com.android.tools.r8.shaking.ProguardNameMatcher create(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):24:28 -> a
     com.android.tools.r8.shaking.ProguardNameMatcher materialize() -> b
     1:43:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):39:81 -> b
     44:66:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):56:78 -> b
     67:111:boolean matchFieldOrMethodNameImpl(java.lang.String,int,java.lang.String,int,java.util.List,int):43:87 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.shaking.i1$a:
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.shaking.i1$b:
+com.android.tools.r8.shaking.ProguardNameMatcher$1 -> com.android.tools.r8.shaking.l1$a:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames -> com.android.tools.r8.shaking.l1$b:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> c
     1:1:void <init>():108:108 -> <init>
     2:3:void <init>(com.android.tools.r8.shaking.ProguardWildcard):111:112 -> <init>
@@ -74353,7 +74885,7 @@
     2:2:java.lang.Iterable getWildcards():123:123 -> a
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher$MatchAllNames materialize():128:128 -> b
     1:1:com.android.tools.r8.shaking.ProguardNameMatcher materialize():104 -> b
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.shaking.i1$c:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchNamePattern -> com.android.tools.r8.shaking.l1$c:
     java.util.List wildcards -> d
     java.lang.String pattern -> c
     1:3:void <init>(com.android.tools.r8.shaking.ProguardConfigurationParser$IdentifierPatternWithWildcards):142:144 -> <init>
@@ -74364,14 +74896,14 @@
     1:1:boolean equals(java.lang.Object):180:180 -> equals
     1:1:int hashCode():185:185 -> hashCode
     1:1:java.lang.String toString():172:172 -> toString
-com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.shaking.i1$d:
+com.android.tools.r8.shaking.ProguardNameMatcher$MatchSpecificName -> com.android.tools.r8.shaking.l1$d:
     java.lang.String name -> c
     1:2:void <init>(java.lang.String):193:194 -> <init>
     1:1:boolean matches(java.lang.String):199:199 -> a
     1:1:boolean equals(java.lang.Object):209:209 -> equals
     1:1:int hashCode():214:214 -> hashCode
     1:1:java.lang.String toString():204:204 -> toString
-com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.yt:
+com.android.tools.r8.shaking.ProguardPackageMatcher -> com.android.tools.r8.internal.Tt:
     java.lang.String pattern -> a
     1:2:void <init>(java.lang.String):12:13 -> <init>
     1:1:boolean matches(com.android.tools.r8.graph.DexType):17:17 -> a
@@ -74383,7 +74915,7 @@
     57:86:boolean matchPackageNameImpl(java.lang.String,int,java.lang.String,int):44:73 -> a
     1:5:boolean equals(java.lang.Object):85:89 -> equals
     1:1:int hashCode():94:94 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.j1:
+com.android.tools.r8.shaking.ProguardPackageNameList -> com.android.tools.r8.shaking.m1:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap packageNames -> a
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap,com.android.tools.r8.shaking.ProguardPackageNameList$1):12:12 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):39:40 -> <init>
@@ -74391,15 +74923,15 @@
     2:5:boolean matches(com.android.tools.r8.graph.DexType):60:63 -> a
     1:15:boolean equals(java.lang.Object):74:88 -> equals
     1:6:int hashCode():98:103 -> hashCode
-com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.shaking.j1$a:
-com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.j1$b:
+com.android.tools.r8.shaking.ProguardPackageNameList$1 -> com.android.tools.r8.shaking.m1$a:
+com.android.tools.r8.shaking.ProguardPackageNameList$Builder -> com.android.tools.r8.shaking.m1$b:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPackageNameList$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     3:3:void <init>():21:21 -> <init>
     1:1:com.android.tools.r8.shaking.ProguardPackageNameList$Builder addPackageName(boolean,com.android.tools.r8.shaking.ProguardPackageMatcher):28:28 -> a
     2:2:com.android.tools.r8.shaking.ProguardPackageNameList build():33:33 -> a
-com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.shaking.k1:
+com.android.tools.r8.shaking.ProguardPathFilter -> com.android.tools.r8.shaking.n1:
     boolean $assertionsDisabled -> a
     boolean enabled -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList patterns -> c
@@ -74409,8 +74941,8 @@
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder builder():14:14 -> a
     2:4:boolean matches(java.lang.String):59:61 -> a
     1:1:boolean isEnabled():55:55 -> b
-com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.shaking.k1$a:
-com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.shaking.k1$b:
+com.android.tools.r8.shaking.ProguardPathFilter$1 -> com.android.tools.r8.shaking.n1$a:
+com.android.tools.r8.shaking.ProguardPathFilter$Builder -> com.android.tools.r8.shaking.n1$b:
     boolean enabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder patterns -> b
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathFilter$1):17:17 -> <init>
@@ -74420,13 +74952,13 @@
     2:2:com.android.tools.r8.shaking.ProguardPathFilter build():40:40 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder disable():30:30 -> b
     1:1:com.android.tools.r8.shaking.ProguardPathFilter$Builder enable():35:35 -> c
-com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.m1:
+com.android.tools.r8.shaking.ProguardPathList -> com.android.tools.r8.shaking.p1:
     1:1:void <init>():10:10 -> <init>
     boolean matches(java.lang.String) -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder builder():13:13 -> a
     1:1:com.android.tools.r8.shaking.ProguardPathList emptyList():17:17 -> b
-com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.shaking.l1:
-com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.m1$a:
+com.android.tools.r8.shaking.ProguardPathList$1 -> com.android.tools.r8.shaking.o1:
+com.android.tools.r8.shaking.ProguardPathList$Builder -> com.android.tools.r8.shaking.p1$a:
     com.android.tools.r8.com.google.common.collect.ImmutableList$Builder matchers -> a
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):22:22 -> <init>
     2:2:void <init>():26:26 -> <init>
@@ -74435,11 +74967,11 @@
     1:1:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String):30 -> a
     2:2:com.android.tools.r8.shaking.ProguardPathList$Builder addFileName(java.lang.String,boolean):34:34 -> a
     3:7:com.android.tools.r8.shaking.ProguardPathList build():39:43 -> a
-com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.n1:
+com.android.tools.r8.shaking.ProguardPathList$EmptyPathList -> com.android.tools.r8.shaking.q1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardPathList$1):122:122 -> <init>
     2:2:void <init>():124:124 -> <init>
     boolean matches(java.lang.String) -> a
-com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.o1:
+com.android.tools.r8.shaking.ProguardPathList$FileNameMatcher -> com.android.tools.r8.shaking.r1:
     boolean negated -> a
     java.lang.String pattern -> b
     1:3:void <init>(boolean,java.lang.String):52:54 -> <init>
@@ -74451,12 +74983,12 @@
     34:34:boolean containsSeparatorsStartingAt(java.lang.String,int):98:98 -> a
     34:34:boolean matchImpl(java.lang.String,int,java.lang.String,int):70 -> a
     35:56:boolean matchImpl(java.lang.String,int,java.lang.String,int):73:94 -> a
-com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.p1:
+com.android.tools.r8.shaking.ProguardPathList$PathList -> com.android.tools.r8.shaking.s1:
     java.util.List matchers -> a
     1:1:void <init>(java.util.List,com.android.tools.r8.shaking.ProguardPathList$1):103:103 -> <init>
     2:3:void <init>(java.util.List):106:107 -> <init>
     1:4:boolean matches(java.lang.String):112:115 -> a
-com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.zt:
+com.android.tools.r8.shaking.ProguardRuleParserException -> com.android.tools.r8.internal.Ut:
     com.android.tools.r8.origin.Origin origin -> c
     com.android.tools.r8.position.Position position -> d
     java.lang.String message -> a
@@ -74466,7 +74998,7 @@
     1:1:java.lang.String getMessage():48:48 -> getMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():33:33 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():38:38 -> getPosition
-com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.shaking.q1:
+com.android.tools.r8.shaking.ProguardTypeMatcher -> com.android.tools.r8.shaking.t1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardTypeMatcher$1):23:23 -> <init>
     2:2:void <init>():31:31 -> <init>
     com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType asSpecificTypeMatcher() -> a
@@ -74483,13 +75015,13 @@
     com.android.tools.r8.graph.DexType getSpecificType() -> b
     boolean matches(com.android.tools.r8.graph.DexType) -> b
     1:1:java.lang.Iterable getWildcards():59:59 -> c
-com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.shaking.q1$a:
-com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.q1$b:
+com.android.tools.r8.shaking.ProguardTypeMatcher$1 -> com.android.tools.r8.shaking.t1$a:
+com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType -> com.android.tools.r8.shaking.t1$b:
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType CLASS -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher$ClassOrType TYPE -> b
     1:2:void <clinit>():35:36 -> <clinit>
     1:1:void <init>(java.lang.String,int):34:34 -> <init>
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.shaking.q1$c:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAllTypes -> com.android.tools.r8.shaking.t1$c:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ALL_TYPES -> a
     1:1:void <clinit>():152:152 -> <clinit>
@@ -74504,7 +75036,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$000():150:150 -> d
     1:1:boolean equals(java.lang.Object):187:187 -> equals
     1:1:int hashCode():192:192 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.shaking.q1$d:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchAnyArgSequence -> com.android.tools.r8.shaking.t1$d:
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_ANY_ARG_SEQUENCE -> a
     1:1:void <clinit>():198:198 -> <clinit>
     1:1:void <init>():196:196 -> <init>
@@ -74512,7 +75044,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$100():196:196 -> d
     1:1:boolean equals(java.lang.Object):217:217 -> equals
     1:1:int hashCode():222:222 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.shaking.q1$e:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchBasicTypes -> com.android.tools.r8.shaking.t1$e:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> b
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_BASIC_TYPES -> a
     1:1:void <clinit>():283:283 -> <clinit>
@@ -74527,7 +75059,7 @@
     1:1:com.android.tools.r8.shaking.ProguardTypeMatcher access$400():281:281 -> d
     1:1:boolean equals(java.lang.Object):321:321 -> equals
     1:1:int hashCode():326:326 -> hashCode
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.shaking.q1$f:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchClassTypes -> com.android.tools.r8.shaking.t1$f:
     com.android.tools.r8.shaking.ProguardWildcard wildcard -> e
     com.android.tools.r8.shaking.ProguardTypeMatcher MATCH_CLASS_TYPES -> a
     com.android.tools.r8.shaking.ProguardTypeMatcher LEGACY_MATCH_CLASS_TYPES -> b
@@ -74550,7 +75082,7 @@
     1:1:boolean equals(java.lang.Object):272:272 -> equals
     1:1:int hashCode():277:277 -> hashCode
     1:1:java.lang.String toString():267:267 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.shaking.q1$g:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchSpecificType -> com.android.tools.r8.shaking.t1$g:
     com.android.tools.r8.graph.DexType type -> a
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardTypeMatcher$1):330:330 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType):334:335 -> <init>
@@ -74560,7 +75092,7 @@
     1:2:boolean equals(java.lang.Object):355:356 -> equals
     1:1:int hashCode():363:363 -> hashCode
     1:1:java.lang.String toString():350:350 -> toString
-com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.shaking.q1$h:
+com.android.tools.r8.shaking.ProguardTypeMatcher$MatchTypePattern -> com.android.tools.r8.shaking.t1$h:
     java.util.List wildcards -> c
     boolean $assertionsDisabled -> a
     java.lang.String pattern -> b
@@ -74591,17 +75123,17 @@
     1:3:boolean equals(java.lang.Object):618:620 -> equals
     1:1:int hashCode():627:627 -> hashCode
     1:1:java.lang.String toString():613:613 -> toString
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.shaking.t1:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule -> com.android.tools.r8.shaking.w1:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.shaking.r1:
-com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.s1:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1 -> com.android.tools.r8.shaking.u1:
+com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$Builder -> com.android.tools.r8.shaking.v1:
     1:1:void <init>(com.android.tools.r8.shaking.ProguardWhyAreYouKeepingRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.shaking.u1:
+com.android.tools.r8.shaking.ProguardWildcard -> com.android.tools.r8.shaking.x1:
     1:1:void <init>():8:8 -> <init>
     com.android.tools.r8.shaking.ProguardWildcard$BackReference asBackReference() -> a
     void setCaptured(java.lang.String) -> a
@@ -74610,7 +75142,7 @@
     boolean isBackReference() -> d
     boolean isPattern() -> e
     com.android.tools.r8.shaking.ProguardWildcard materialize() -> f
-com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.shaking.u1$a:
+com.android.tools.r8.shaking.ProguardWildcard$BackReference -> com.android.tools.r8.shaking.x1$a:
     int referenceIndex -> b
     com.android.tools.r8.shaking.ProguardWildcard$Pattern reference -> a
     1:2:void <init>(int):85:86 -> <init>
@@ -74623,7 +75155,7 @@
     1:5:com.android.tools.r8.shaking.ProguardWildcard materialize():80 -> f
     1:1:java.lang.String getCaptured():105:105 -> g
     1:1:java.lang.String toString():130:130 -> toString
-com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.shaking.u1$b:
+com.android.tools.r8.shaking.ProguardWildcard$Pattern -> com.android.tools.r8.shaking.x1$b:
     java.lang.String pattern -> a
     java.lang.String captured -> b
     1:1:void <init>(java.lang.String):35:35 -> <init>
@@ -74638,7 +75170,7 @@
     6:6:void setCaptured(java.lang.String):41:41 -> h
     6:6:com.android.tools.r8.shaking.ProguardWildcard$Pattern materialize():60 -> h
     1:1:java.lang.String toString():76:76 -> toString
-com.android.tools.r8.shaking.ReprocessClassInitializerRule -> com.android.tools.r8.shaking.x1:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule -> com.android.tools.r8.shaking.A1:
     int $r8$clinit -> q
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type type -> r
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type,com.android.tools.r8.shaking.ReprocessClassInitializerRule$1):11:11 -> <init>
@@ -74646,22 +75178,22 @@
     1:7:java.lang.String typeString():111:117 -> A
     1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type getType():96:96 -> B
     com.android.tools.r8.shaking.ReprocessClassInitializerRule asReprocessClassInitializerRule() -> t
-com.android.tools.r8.shaking.ReprocessClassInitializerRule$1 -> com.android.tools.r8.shaking.v1:
-com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder -> com.android.tools.r8.shaking.w1:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule$1 -> com.android.tools.r8.shaking.y1:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder -> com.android.tools.r8.shaking.z1:
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ReprocessClassInitializerRule$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.shaking.ReprocessClassInitializerRule$Builder setType(com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type):28:28 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
     1:11:com.android.tools.r8.shaking.ReprocessClassInitializerRule build():39:49 -> e
-com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type -> com.android.tools.r8.shaking.x1$a:
+com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type -> com.android.tools.r8.shaking.A1$a:
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type[] $VALUES -> c
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type ALWAYS -> a
     com.android.tools.r8.shaking.ReprocessClassInitializerRule$Type NEVER -> b
     1:2:void <clinit>():14:15 -> <clinit>
     3:3:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
-com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.A1:
+com.android.tools.r8.shaking.ReprocessMethodRule -> com.android.tools.r8.shaking.D1:
     com.android.tools.r8.shaking.ReprocessMethodRule$Type type -> r
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.ReprocessMethodRule$Type,com.android.tools.r8.shaking.ReprocessMethodRule$1):11:11 -> <init>
@@ -74669,326 +75201,328 @@
     1:7:java.lang.String typeString():111:117 -> A
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Type getType():96:96 -> B
     com.android.tools.r8.shaking.ReprocessMethodRule asReprocessMethodRule() -> u
-com.android.tools.r8.shaking.ReprocessMethodRule$1 -> com.android.tools.r8.shaking.y1:
-com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8.shaking.z1:
+com.android.tools.r8.shaking.ReprocessMethodRule$1 -> com.android.tools.r8.shaking.B1:
+com.android.tools.r8.shaking.ReprocessMethodRule$Builder -> com.android.tools.r8.shaking.C1:
     com.android.tools.r8.shaking.ReprocessMethodRule$Type type -> p
     1:1:void <init>(com.android.tools.r8.shaking.ReprocessMethodRule$1):18:18 -> <init>
     2:2:void <init>():24:24 -> <init>
     1:1:com.android.tools.r8.shaking.ReprocessMethodRule$Builder setType(com.android.tools.r8.shaking.ReprocessMethodRule$Type):28:28 -> a
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
     1:11:com.android.tools.r8.shaking.ReprocessMethodRule build():39:49 -> e
-com.android.tools.r8.shaking.ReprocessMethodRule$Type -> com.android.tools.r8.shaking.A1$a:
+com.android.tools.r8.shaking.ReprocessMethodRule$Type -> com.android.tools.r8.shaking.D1$a:
     com.android.tools.r8.shaking.ReprocessMethodRule$Type NEVER -> b
     com.android.tools.r8.shaking.ReprocessMethodRule$Type[] $VALUES -> c
     com.android.tools.r8.shaking.ReprocessMethodRule$Type ALWAYS -> a
     1:2:void <clinit>():14:15 -> <clinit>
     3:3:void <clinit>():13:13 -> <clinit>
     1:1:void <init>(java.lang.String,int):13:13 -> <init>
-com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.shaking.B1:
-    java.util.Set noHorizontalClassMerging -> w
-    java.util.Queue delayedRootSetActionItems -> G
-    java.util.Set neverPropagateValue -> y
+com.android.tools.r8.shaking.RootSetBuilder -> com.android.tools.r8.shaking.E1:
+    java.util.Set noVerticalClassMerging -> w
+    java.util.Set noStaticClassMerging -> y
     java.util.Set neverReprocess -> s
     java.util.Set neverClassInline -> u
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> t
     java.lang.Iterable rules -> e
     java.util.LinkedHashMap reasonAsked -> i
-    com.android.tools.r8.utils.InternalOptions options -> H
-    java.util.Map dependentKeepClassCompatRule -> B
-    java.util.Map noSideEffects -> D
-    java.util.Set ifRules -> J
-    com.android.tools.r8.shaking.DexStringCache dexStringCache -> I
+    java.util.Map dependentSoftPinned -> B
+    java.util.Map mayHaveSideEffects -> D
     com.android.tools.r8.graph.DirectMappedDexApplication application -> d
-    java.util.Set identifierNameStrings -> F
     java.util.Set whyAreYouNotInlining -> o
     java.util.Set keepUnusedArguments -> q
+    java.util.Map assumeNoSideEffectsWarnings -> L
     java.util.Set alwaysInline -> k
+    java.util.Map assumedValues -> F
     java.util.Set neverInline -> m
     com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules softPinned -> g
-    java.util.Set noStaticClassMerging -> x
+    java.util.Set noHorizontalClassMerging -> x
+    java.util.Set neverPropagateValue -> z
+    java.util.Queue delayedRootSetActionItems -> H
     com.android.tools.r8.graph.AppView appView -> b
-    java.util.Set noVerticalClassMerging -> v
-    java.util.Map dependentNoShrinking -> z
+    java.util.Set noUnusedInterfaceRemoval -> v
+    com.android.tools.r8.utils.InternalOptions options -> I
     java.util.LinkedHashMap checkDiscarded -> j
-    java.util.Map dependentSoftPinned -> A
+    java.util.Map dependentNoShrinking -> A
+    java.util.Set identifierNameStrings -> G
     java.util.Set noObfuscation -> h
-    java.util.Map mayHaveSideEffects -> C
+    java.util.Map dependentKeepClassCompatRule -> C
+    com.android.tools.r8.shaking.DexStringCache dexStringCache -> J
     com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules noShrinking -> f
     java.util.Set keepParametersWithConstantValue -> p
     com.android.tools.r8.graph.SubtypingInfo subtypingInfo -> c
-    java.util.Map assumeNoSideEffectsWarnings -> K
     java.util.Set reprocess -> r
     boolean $assertionsDisabled -> a
-    java.util.Map assumedValues -> E
+    java.util.Map noSideEffects -> E
+    java.util.Set ifRules -> K
     java.util.Set forceInline -> l
     java.util.Set bypassClinitforInlining -> n
     1:1:void <clinit>():80:80 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):129:129 -> <init>
-    2:50:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):86:134 -> <init>
+    1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):130:130 -> <init>
+    2:51:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.SubtypingInfo,java.lang.Iterable):86:135 -> <init>
     void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult) -> a
     boolean lambda$process$0(com.android.tools.r8.graph.DexDefinition) -> a
     1:1:com.android.tools.r8.graph.AppView access$200(com.android.tools.r8.shaking.RootSetBuilder):80:80 -> a
     2:2:com.android.tools.r8.graph.DexDefinition access$600(com.android.tools.r8.graph.DexDefinition,java.util.Map):80:80 -> a
     3:3:void access$700(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):80:80 -> a
-    4:19:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):271:286 -> a
-    20:20:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):285:285 -> a
-    21:26:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):289:294 -> a
-    27:62:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):301:336 -> a
-    63:66:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):335:338 -> a
-    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
-    67:67:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):338 -> a
-    68:98:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):338:368 -> a
-    99:99:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):317:317 -> a
-    100:111:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):372:383 -> a
-    112:143:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):393:424 -> a
-    144:153:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():429:438 -> a
-    154:155:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):483:484 -> a
-    156:157:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):625:626 -> a
-    156:157:boolean access$400(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):80 -> a
-    158:168:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):637:647 -> a
-    169:169:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    169:169:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):647 -> a
-    170:180:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):651:661 -> a
-    181:182:void lambda$markMatchingMethods$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):673:674 -> a
-    183:183:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):704:704 -> a
-    184:185:void lambda$markMatchingFields$10(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):706:707 -> a
-    186:241:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):715:770 -> a
-    242:243:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):718:719 -> a
-    244:250:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):726:732 -> a
-    251:251:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):727:727 -> a
-    252:252:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):739:739 -> a
-    253:342:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    253:342:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):742 -> a
-    343:358:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):742:757 -> a
-    359:371:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):756:768 -> a
-    372:373:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):778:779 -> a
-    374:385:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):841:852 -> a
-    386:386:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):930:930 -> a
-    386:386:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):852 -> a
-    387:403:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):854:870 -> a
-    404:409:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):877:882 -> a
-    410:410:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):881:881 -> a
-    411:411:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    411:411:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):881 -> a
-    412:412:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):881:881 -> a
-    413:413:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):887:887 -> a
-    414:417:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):900:903 -> a
-    414:417:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):888 -> a
-    418:420:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):918:920 -> a
-    421:432:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexEncodedMember,java.util.function.Consumer):939:950 -> a
-    433:437:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):960:964 -> a
-    438:439:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):977:978 -> a
-    438:439:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):966 -> a
-    440:442:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):970:972 -> a
-    443:450:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):993:1000 -> a
-    451:451:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    451:451:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1000 -> a
-    452:454:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1004:1006 -> a
-    455:458:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1017:1020 -> a
-    459:459:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    459:459:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1020 -> a
-    460:460:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1023:1023 -> a
-    461:462:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1029:1030 -> a
-    463:463:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    463:463:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1030 -> a
-    464:464:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1032:1032 -> a
-    465:474:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1036:1045 -> a
-    475:475:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    475:475:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1045 -> a
-    476:484:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1046:1054 -> a
-    485:485:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
-    485:485:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1054 -> a
-    486:486:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1055:1055 -> a
-    487:487:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1080:1080 -> a
-    488:488:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    488:488:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1081 -> a
-    489:507:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1082:1100 -> a
-    508:508:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):256:256 -> a
-    508:508:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1100 -> a
-    509:512:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1106:1109 -> a
-    513:513:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    513:513:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1109 -> a
-    514:514:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1110:1110 -> a
-    515:523:boolean com.android.tools.r8.shaking.ProguardMemberRule.isSpecific():310:318 -> a
-    515:523:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1111 -> a
-    524:528:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1112:1112 -> a
-    539:578:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1123:1162 -> a
-    579:579:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
-    579:579:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1162 -> a
-    580:584:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1162:1166 -> a
-    585:589:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1060:1064 -> a
-    585:589:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1167 -> a
-    590:590:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    590:590:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1066 -> a
-    590:590:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1167 -> a
-    591:594:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1067:1070 -> a
-    591:594:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1167 -> a
-    595:606:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1168:1179 -> a
-    607:638:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1178:1209 -> a
-    639:639:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1203:1203 -> a
-    640:658:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1200:1218 -> a
-    659:659:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1215:1215 -> a
-    660:660:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
-    660:660:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1219 -> a
-    661:679:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1220:1238 -> a
-    680:688:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1232:1240 -> a
-    689:717:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1223:1251 -> a
-    718:718:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    718:718:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1255 -> a
-    719:735:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1256:1272 -> a
-    736:736:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    736:736:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1273 -> a
-    737:759:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1274:1296 -> a
-    760:768:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1290:1298 -> a
-    769:769:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
-    769:769:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1300 -> a
-    770:780:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1301:1311 -> a
-    781:797:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1305:1321 -> a
-    798:798:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexType):1133:1133 -> a
-    799:799:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1141:1141 -> a
-    800:804:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1699:1703 -> a
-    805:805:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$21(com.android.tools.r8.utils.OriginWithPosition):1702:1702 -> a
-    806:806:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1707:1707 -> a
-    807:818:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1726:1737 -> a
-    819:819:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1732:1732 -> a
+    4:19:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):273:288 -> a
+    20:20:void runPerRule(java.util.concurrent.ExecutorService,java.util.List,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):287:287 -> a
+    21:26:void lambda$runPerRule$4(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):291:296 -> a
+    27:62:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):303:338 -> a
+    63:66:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):337:340 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> a
+    67:67:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):340 -> a
+    68:99:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):340:371 -> a
+    100:100:com.android.tools.r8.shaking.RootSetBuilder$RootSet run(java.util.concurrent.ExecutorService):319:319 -> a
+    101:112:void propagateAssumeRules(com.android.tools.r8.graph.DexClass):375:386 -> a
+    113:144:void propagateAssumeRules(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,java.util.Set,java.util.Map):396:427 -> a
+    145:154:com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet buildConsequentRootSet():432:441 -> a
+    155:156:void lambda$markMatchingVisibleMethods$5(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):486:487 -> a
+    157:158:boolean canInsertForwardingMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):628:629 -> a
+    157:158:boolean access$400(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedMethod):80 -> a
+    159:169:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):640:650 -> a
+    170:170:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    170:170:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):650 -> a
+    171:181:void markMatchingOverriddenMethods(com.android.tools.r8.graph.AppInfoWithClassHierarchy,com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):654:664 -> a
+    182:183:void lambda$markMatchingMethods$8(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):676:677 -> a
+    184:184:void markMatchingFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):707:707 -> a
+    185:186:void lambda$markMatchingFields$10(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):709:710 -> a
+    187:242:void writeSeeds(com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,java.util.function.Predicate):718:773 -> a
+    243:244:void lambda$writeSeeds$11(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexType):721:722 -> a
+    245:251:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):729:735 -> a
+    252:252:void lambda$writeSeeds$12(java.util.function.Predicate,java.io.PrintStream,com.android.tools.r8.graph.DexField):730:730 -> a
+    253:253:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):742:742 -> a
+    254:343:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    254:343:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):745 -> a
+    344:359:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):745:760 -> a
+    360:372:void lambda$writeSeeds$13(java.util.function.Predicate,com.android.tools.r8.shaking.AppInfoWithLiveness,java.io.PrintStream,com.android.tools.r8.graph.DexMethod):759:771 -> a
+    373:374:boolean satisfyAccessFlag(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):781:782 -> a
+    375:386:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):844:855 -> a
+    387:387:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):933:933 -> a
+    387:387:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):855 -> a
+    388:404:boolean anyImplementedInterfaceMatchesImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):857:873 -> a
+    405:410:boolean anySourceMatchesInheritanceRuleDirectly(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,boolean):880:885 -> a
+    411:411:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):884:884 -> a
+    412:412:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    412:412:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):884 -> a
+    413:413:boolean lambda$anySourceMatchesInheritanceRuleDirectly$14(boolean,com.android.tools.r8.graph.DexType):884:884 -> a
+    414:414:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):890:890 -> a
+    415:418:boolean ruleSatisfied(com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexClass):903:906 -> a
+    415:418:boolean allRulesSatisfied(java.util.Collection,com.android.tools.r8.graph.DexClass):891 -> a
+    419:421:boolean ruleSatisfiedByFields(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):921:923 -> a
+    422:433:boolean containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexEncodedMember,java.util.function.Consumer):942:953 -> a
+    434:438:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):963:967 -> a
+    439:440:com.android.tools.r8.graph.DexAnnotation getFirstAnnotationThatMatches(com.android.tools.r8.shaking.ProguardTypeMatcher,com.android.tools.r8.graph.DexAnnotationSet):980:981 -> a
+    439:440:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):969 -> a
+    441:443:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexAnnotationSet):973:975 -> a
+    444:451:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):996:1003 -> a
+    452:452:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    452:452:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1003 -> a
+    453:455:void markMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1007:1009 -> a
+    456:459:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1020:1023 -> a
+    460:460:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    460:460:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1023 -> a
+    461:461:void markField(com.android.tools.r8.graph.DexEncodedField,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1026:1026 -> a
+    462:463:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1032:1033 -> a
+    464:464:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
+    464:464:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1033 -> a
+    465:465:void markClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):1035:1035 -> a
+    466:475:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1039:1048 -> a
+    476:476:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    476:476:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1048 -> a
+    477:485:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1049:1057 -> a
+    486:486:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> a
+    486:486:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1057 -> a
+    487:487:void includeDescriptor(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1058:1058 -> a
+    488:488:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1083:1083 -> a
+    489:489:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    489:489:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1084 -> a
+    490:508:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1085:1103 -> a
+    509:509:boolean com.android.tools.r8.graph.DexMethod.isLambdaDeserializeMethod(com.android.tools.r8.graph.DexItemFactory):260:260 -> a
+    509:509:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1103 -> a
+    510:513:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1109:1112 -> a
+    514:514:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    514:514:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1112 -> a
+    515:515:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1113:1113 -> a
+    516:524:boolean com.android.tools.r8.shaking.ProguardMemberRule.isSpecific():310:318 -> a
+    516:524:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1114 -> a
+    525:529:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1115:1115 -> a
+    540:579:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1126:1165 -> a
+    580:580:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> a
+    580:580:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1165 -> a
+    581:585:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1165:1169 -> a
+    586:590:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1063:1067 -> a
+    586:590:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1170 -> a
+    591:591:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    591:591:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1069 -> a
+    591:591:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1170 -> a
+    592:595:void includeDescriptorClasses(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardKeepRuleBase):1070:1073 -> a
+    592:595:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1170 -> a
+    596:607:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1171:1182 -> a
+    608:639:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1181:1212 -> a
+    640:640:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1206:1206 -> a
+    641:659:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1203:1221 -> a
+    660:660:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1218:1218 -> a
+    661:661:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isClassInlineRule():0:0 -> a
+    661:661:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1222 -> a
+    662:680:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1223:1241 -> a
+    681:689:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1235:1243 -> a
+    690:721:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1226:1257 -> a
+    722:722:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    722:722:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1261 -> a
+    723:739:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1262:1278 -> a
+    740:740:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
+    740:740:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1279 -> a
+    741:763:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1280:1302 -> a
+    764:772:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1296:1304 -> a
+    773:773:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isReprocessMethodRule():0:0 -> a
+    773:773:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1306 -> a
+    774:784:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1307:1317 -> a
+    785:801:void addItemToSets(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.shaking.ProguardIfRule):1311:1327 -> a
+    802:802:java.util.Set lambda$addItemToSets$16(com.android.tools.r8.graph.DexType):1136:1136 -> a
+    803:803:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addItemToSets$17(com.android.tools.r8.graph.DexReference):1144:1144 -> a
+    804:808:void reportAssumeNoSideEffectsWarningForJavaLangClassMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardAssumeNoSideEffectRule):1705:1709 -> a
+    809:809:java.util.Set lambda$reportAssumeNoSideEffectsWarningForJavaLangClassMethod$21(com.android.tools.r8.utils.OriginWithPosition):1708:1708 -> a
+    810:810:boolean isWaitOrNotifyMethod(com.android.tools.r8.graph.DexMethod):1713:1713 -> a
+    811:822:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1732:1743 -> a
+    823:823:void lambda$generateAssumeNoSideEffectsWarnings$22(com.android.tools.r8.utils.OriginWithPosition,java.util.Set):1738:1738 -> a
     1:1:com.android.tools.r8.shaking.DexStringCache access$300(com.android.tools.r8.shaking.RootSetBuilder):80:80 -> b
-    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):202:202 -> b
-    3:12:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):448:457 -> b
-    13:14:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):491:492 -> b
-    15:16:void lambda$markMatchingOverriddenMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):658:659 -> b
-    17:17:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):671:671 -> b
-    18:26:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):686:694 -> b
-    27:28:void lambda$markMatchingVisibleFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):691:692 -> b
-    29:29:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):774:774 -> b
-    29:29:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):151 -> b
-    30:30:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):154:154 -> b
-    31:31:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):783:783 -> b
-    31:31:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):157 -> b
-    32:32:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):930:930 -> b
-    32:32:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):783 -> b
-    32:32:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):157 -> b
-    33:86:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):161:214 -> b
-    87:87:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):191:191 -> b
-    88:166:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):184:262 -> b
-    167:168:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):253:254 -> b
-    169:169:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):247:247 -> b
-    170:172:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):238:240 -> b
-    173:175:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):239:241 -> b
-    176:176:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):221:221 -> b
-    177:177:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):783:783 -> b
-    178:178:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):930:930 -> b
-    178:178:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):783 -> b
-    179:179:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):795:795 -> b
-    179:179:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):787 -> b
-    180:190:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):805:815 -> b
-    180:190:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):795 -> b
-    180:190:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):787 -> b
-    191:191:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):930:930 -> b
-    191:191:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):815 -> b
-    191:191:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):795 -> b
-    191:191:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):787 -> b
-    192:196:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):817:821 -> b
-    192:196:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):795 -> b
-    192:196:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):787 -> b
-    197:197:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):800:800 -> b
-    197:197:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):787 -> b
-    198:203:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):827:832 -> b
-    198:203:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):791 -> b
-    204:206:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):907:909 -> b
-    207:207:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addItemToSets$18(com.android.tools.r8.graph.DexReference):1150:1150 -> b
-    208:217:void generateAssumeNoSideEffectsWarnings():1714:1723 -> b
+    2:2:boolean lambda$process$1(com.android.tools.r8.graph.DexDefinition):203:203 -> b
+    3:12:com.android.tools.r8.graph.DexDefinition testAndGetPrecondition(com.android.tools.r8.graph.DexDefinition,java.util.Map):451:460 -> b
+    13:14:void lambda$markMatchingVisibleMethods$6(java.util.Map,java.util.Collection,java.util.Set,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):494:495 -> b
+    15:16:void lambda$markMatchingOverriddenMethods$7(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedMethod):661:662 -> b
+    17:17:void markMatchingMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):674:674 -> b
+    18:26:void markMatchingVisibleFields(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):689:697 -> b
+    27:28:void lambda$markMatchingVisibleFields$9(java.util.Map,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.graph.DexEncodedField):694:695 -> b
+    29:29:boolean satisfyClassType(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):777:777 -> b
+    29:29:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):152 -> b
+    30:30:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):155:155 -> b
+    31:31:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):786:786 -> b
+    31:31:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):158 -> b
+    32:32:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):933:933 -> b
+    32:32:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):786 -> b
+    32:32:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):158 -> b
+    33:86:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):162:215 -> b
+    87:87:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):192:192 -> b
+    88:167:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):185:264 -> b
+    168:169:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):255:256 -> b
+    170:170:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):248:248 -> b
+    171:173:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):239:241 -> b
+    174:176:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):240:242 -> b
+    177:177:void process(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.shaking.ProguardIfRule):222:222 -> b
+    178:178:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):786:786 -> b
+    179:179:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):933:933 -> b
+    179:179:com.android.tools.r8.shaking.AnnotationMatchResult satisfyAnnotation(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexClass):786 -> b
+    180:180:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):798:798 -> b
+    180:180:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):790 -> b
+    181:191:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):808:818 -> b
+    181:191:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):798 -> b
+    181:191:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):790 -> b
+    192:192:com.android.tools.r8.shaking.AnnotationMatchResult containsAllAnnotations(java.util.List,com.android.tools.r8.graph.DexClass):933:933 -> b
+    192:192:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):818 -> b
+    192:192:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):798 -> b
+    192:192:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):790 -> b
+    193:197:boolean anySuperTypeMatchesExtendsRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardConfigurationRule):820:824 -> b
+    193:197:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):798 -> b
+    193:197:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):790 -> b
+    198:198:boolean satisfyExtendsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):803:803 -> b
+    198:198:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):790 -> b
+    199:204:boolean satisfyImplementsRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):830:835 -> b
+    199:204:boolean satisfyInheritanceRule(com.android.tools.r8.graph.DexClass,com.android.tools.r8.shaking.ProguardConfigurationRule):794 -> b
+    205:207:boolean ruleSatisfiedByMethods(com.android.tools.r8.shaking.ProguardMemberRule,java.lang.Iterable):910:912 -> b
+    208:208:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addItemToSets$18(com.android.tools.r8.graph.DexReference):1153:1153 -> b
+    209:218:void generateAssumeNoSideEffectsWarnings():1720:1729 -> b
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$19(com.android.tools.r8.graph.DexReference) -> c
     boolean lambda$process$2(com.android.tools.r8.graph.DexDefinition) -> c
     1:1:java.util.Queue access$500(com.android.tools.r8.shaking.RootSetBuilder):80:80 -> c
-    2:36:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):469:503 -> c
+    2:36:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):472:506 -> c
     37:37:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> c
-    37:37:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):504 -> c
-    38:41:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):505:508 -> c
+    37:37:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):507 -> c
+    38:41:void markMatchingVisibleMethods(com.android.tools.r8.graph.DexClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,boolean,com.android.tools.r8.shaking.ProguardIfRule):508:511 -> c
     com.android.tools.r8.graph.DexReference lambda$addItemToSets$20(com.android.tools.r8.graph.DexReference) -> d
     boolean lambda$process$3(com.android.tools.r8.graph.DexDefinition) -> d
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$includeDescriptor$15(com.android.tools.r8.graph.DexReference):1051:1051 -> e
-com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.B1$a:
-com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.shaking.B1$b:
-    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.List):2106:2106 -> <init>
-com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules -> com.android.tools.r8.shaking.B1$c:
-    1:1:void <init>():1464:1464 -> <init>
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$includeDescriptor$15(com.android.tools.r8.graph.DexReference):1054:1054 -> e
+com.android.tools.r8.shaking.RootSetBuilder$1 -> com.android.tools.r8.shaking.E1$a:
+com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet -> com.android.tools.r8.shaking.E1$b:
+    1:1:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.List):2116:2116 -> <init>
+com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules -> com.android.tools.r8.shaking.E1$c:
+    1:1:void <init>():1470:1470 -> <init>
     boolean containsClass(com.android.tools.r8.graph.DexType) -> a
     boolean containsField(com.android.tools.r8.graph.DexField) -> a
     boolean containsMethod(com.android.tools.r8.graph.DexMethod) -> a
-    1:1:boolean containsReference(com.android.tools.r8.graph.DexReference):1477:1477 -> a
+    1:1:boolean containsReference(com.android.tools.r8.graph.DexReference):1483:1483 -> a
     java.util.Set getRulesForClass(com.android.tools.r8.graph.DexType) -> b
     java.util.Set getRulesForField(com.android.tools.r8.graph.DexField) -> b
     java.util.Set getRulesForMethod(com.android.tools.r8.graph.DexMethod) -> b
-    1:1:java.util.Set getRulesForReference(com.android.tools.r8.graph.DexReference):1507:1507 -> b
-com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules -> com.android.tools.r8.shaking.B1$d:
+    1:1:java.util.Set getRulesForReference(com.android.tools.r8.graph.DexReference):1513:1513 -> b
+com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules -> com.android.tools.r8.shaking.E1$d:
     java.util.Map classesWithRules -> b
     com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules EMPTY -> a
     java.util.Map fieldsWithRules -> c
     java.util.Map methodsWithRules -> d
-    1:3:void <clinit>():1514:1516 -> <clinit>
-    1:1:void <init>():1523:1523 -> <init>
-    2:5:void <init>(java.util.Map,java.util.Map,java.util.Map):1529:1532 -> <init>
-    1:1:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules access$800():1512:1512 -> a
-    2:2:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1536:1536 -> a
-    3:3:void forEachClass(java.util.function.BiConsumer):1602:1602 -> a
-    3:3:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1536 -> a
-    4:4:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1537:1537 -> a
-    5:5:void forEachField(java.util.function.BiConsumer):1612:1612 -> a
-    5:5:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1537 -> a
-    6:6:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1538:1538 -> a
-    7:7:void forEachMethod(java.util.function.BiConsumer):1635:1635 -> a
-    7:7:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1538 -> a
-    8:8:void addClassWithRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1542:1542 -> a
-    9:9:void addClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1546:1546 -> a
-    10:10:void addFieldWithRule(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.ProguardKeepRuleBase):1550:1550 -> a
-    11:11:void addFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1554:1554 -> a
-    12:12:void addMethodWithRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.ProguardKeepRuleBase):1558:1558 -> a
-    13:13:void addMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1562:1562 -> a
-    14:14:void addReferenceWithRule(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.ProguardKeepRuleBase):1566:1566 -> a
-    15:15:boolean containsClass(com.android.tools.r8.graph.DexType):1577:1577 -> a
-    16:16:boolean containsField(com.android.tools.r8.graph.DexField):1582:1582 -> a
-    17:17:boolean containsMethod(com.android.tools.r8.graph.DexMethod):1587:1587 -> a
-    18:18:void forEachClass(java.util.function.Consumer):1597:1597 -> a
-    1:1:java.util.Set getRulesForClass(com.android.tools.r8.graph.DexType):1640:1640 -> b
-    2:2:java.util.Set getRulesForField(com.android.tools.r8.graph.DexField):1645:1645 -> b
-    3:3:java.util.Set getRulesForMethod(com.android.tools.r8.graph.DexMethod):1650:1650 -> b
-    4:4:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1670:1670 -> b
-    5:5:void forEachClass(java.util.function.BiConsumer):1602:1602 -> b
-    5:5:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1670 -> b
-    6:6:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1671:1671 -> b
-    7:7:void forEachField(java.util.function.BiConsumer):1612:1612 -> b
-    7:7:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1671 -> b
-    8:8:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1672:1672 -> b
-    9:9:void forEachMethod(java.util.function.BiConsumer):1635:1635 -> b
-    9:9:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1672 -> b
-    10:10:void putClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1676:1676 -> b
-    11:11:void putFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1680:1680 -> b
-    12:12:void putMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1684:1684 -> b
-    1:1:java.util.Set lambda$addClassWithRule$0(com.android.tools.r8.graph.DexType):1542:1542 -> c
-    2:2:java.util.Set lambda$addFieldWithRule$2(com.android.tools.r8.graph.DexField):1550:1550 -> c
-    3:3:java.util.Set lambda$addMethodWithRule$4(com.android.tools.r8.graph.DexMethod):1558:1558 -> c
-    4:4:void removeReference(com.android.tools.r8.graph.DexReference):1666:1666 -> c
-    1:1:java.util.Set lambda$addClassWithRules$1(com.android.tools.r8.graph.DexType):1546:1546 -> d
-    2:2:java.util.Set lambda$addFieldWithRules$3(com.android.tools.r8.graph.DexField):1554:1554 -> d
-    3:3:java.util.Set lambda$addMethodWithRules$5(com.android.tools.r8.graph.DexMethod):1562:1562 -> d
-    1:1:void removeClass(com.android.tools.r8.graph.DexType):1654:1654 -> e
-    2:2:void removeField(com.android.tools.r8.graph.DexField):1658:1658 -> e
-    3:3:void removeMethod(com.android.tools.r8.graph.DexMethod):1662:1662 -> e
-com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.B1$e:
-    java.util.Set noHorizontalClassMerging -> w
-    java.util.Set noStaticClassMerging -> x
-    java.util.Set neverPropagateValue -> y
+    1:3:void <clinit>():1520:1522 -> <clinit>
+    1:1:void <init>():1529:1529 -> <init>
+    2:5:void <init>(java.util.Map,java.util.Map,java.util.Map):1535:1538 -> <init>
+    1:1:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules access$800():1518:1518 -> a
+    2:2:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1542:1542 -> a
+    3:3:void forEachClass(java.util.function.BiConsumer):1608:1608 -> a
+    3:3:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1542 -> a
+    4:4:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1543:1543 -> a
+    5:5:void forEachField(java.util.function.BiConsumer):1618:1618 -> a
+    5:5:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1543 -> a
+    6:6:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1544:1544 -> a
+    7:7:void forEachMethod(java.util.function.BiConsumer):1641:1641 -> a
+    7:7:void addAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1544 -> a
+    8:8:void addClassWithRule(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase):1548:1548 -> a
+    9:9:void addClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1552:1552 -> a
+    10:10:void addFieldWithRule(com.android.tools.r8.graph.DexField,com.android.tools.r8.shaking.ProguardKeepRuleBase):1556:1556 -> a
+    11:11:void addFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1560:1560 -> a
+    12:12:void addMethodWithRule(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.shaking.ProguardKeepRuleBase):1564:1564 -> a
+    13:13:void addMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1568:1568 -> a
+    14:14:void addReferenceWithRule(com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.ProguardKeepRuleBase):1572:1572 -> a
+    15:15:boolean containsClass(com.android.tools.r8.graph.DexType):1583:1583 -> a
+    16:16:boolean containsField(com.android.tools.r8.graph.DexField):1588:1588 -> a
+    17:17:boolean containsMethod(com.android.tools.r8.graph.DexMethod):1593:1593 -> a
+    18:18:void forEachClass(java.util.function.Consumer):1603:1603 -> a
+    1:1:java.util.Set getRulesForClass(com.android.tools.r8.graph.DexType):1646:1646 -> b
+    2:2:java.util.Set getRulesForField(com.android.tools.r8.graph.DexField):1651:1651 -> b
+    3:3:java.util.Set getRulesForMethod(com.android.tools.r8.graph.DexMethod):1656:1656 -> b
+    4:4:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1676:1676 -> b
+    5:5:void forEachClass(java.util.function.BiConsumer):1608:1608 -> b
+    5:5:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1676 -> b
+    6:6:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1677:1677 -> b
+    7:7:void forEachField(java.util.function.BiConsumer):1618:1618 -> b
+    7:7:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1677 -> b
+    8:8:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1678:1678 -> b
+    9:9:void forEachMethod(java.util.function.BiConsumer):1641:1641 -> b
+    9:9:void putAll(com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1678 -> b
+    10:10:void putClassWithRules(com.android.tools.r8.graph.DexType,java.util.Set):1682:1682 -> b
+    11:11:void putFieldWithRules(com.android.tools.r8.graph.DexField,java.util.Set):1686:1686 -> b
+    12:12:void putMethodWithRules(com.android.tools.r8.graph.DexMethod,java.util.Set):1690:1690 -> b
+    1:1:java.util.Set lambda$addClassWithRule$0(com.android.tools.r8.graph.DexType):1548:1548 -> c
+    2:2:java.util.Set lambda$addFieldWithRule$2(com.android.tools.r8.graph.DexField):1556:1556 -> c
+    3:3:java.util.Set lambda$addMethodWithRule$4(com.android.tools.r8.graph.DexMethod):1564:1564 -> c
+    4:4:void removeReference(com.android.tools.r8.graph.DexReference):1672:1672 -> c
+    1:1:java.util.Set lambda$addClassWithRules$1(com.android.tools.r8.graph.DexType):1552:1552 -> d
+    2:2:java.util.Set lambda$addFieldWithRules$3(com.android.tools.r8.graph.DexField):1560:1560 -> d
+    3:3:java.util.Set lambda$addMethodWithRules$5(com.android.tools.r8.graph.DexMethod):1568:1568 -> d
+    1:1:void removeClass(com.android.tools.r8.graph.DexType):1660:1660 -> e
+    2:2:void removeField(com.android.tools.r8.graph.DexField):1664:1664 -> e
+    3:3:void removeMethod(com.android.tools.r8.graph.DexMethod):1668:1668 -> e
+com.android.tools.r8.shaking.RootSetBuilder$RootSet -> com.android.tools.r8.shaking.E1$e:
+    java.util.Set noVerticalClassMerging -> w
+    java.util.Set noHorizontalClassMerging -> x
+    java.util.Set noStaticClassMerging -> y
+    java.util.Set neverPropagateValue -> z
     java.util.Set reprocess -> s
     boolean $assertionsDisabled -> j
     java.util.Set neverReprocess -> t
-    java.util.Set noVerticalClassMerging -> v
+    java.util.Set noUnusedInterfaceRemoval -> v
     com.android.tools.r8.utils.PredicateSet alwaysClassInline -> u
-    java.util.Map mayHaveSideEffects -> z
-    java.util.Map noSideEffects -> A
-    java.util.Map assumedValues -> B
-    java.util.Set identifierNameStrings -> C
-    java.util.Set ifRules -> D
+    java.util.Map mayHaveSideEffects -> A
+    java.util.Map noSideEffects -> B
+    java.util.Map assumedValues -> C
+    java.util.Set identifierNameStrings -> D
     com.android.tools.r8.com.google.common.collect.ImmutableList checkDiscarded -> l
+    java.util.Set ifRules -> E
     com.android.tools.r8.com.google.common.collect.ImmutableList reasonAsked -> k
     java.util.Set bypassClinitForInlining -> o
     java.util.Set whyAreYouNotInlining -> p
@@ -74996,74 +75530,74 @@
     java.util.Set keepUnusedArguments -> r
     java.util.Set alwaysInline -> m
     java.util.Set forceInline -> n
-    1:1:void <clinit>():1741:1741 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1741:1741 -> <init>
-    2:31:void <init>(com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List):1794:1823 -> <init>
+    1:1:void <clinit>():1747:1747 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List,com.android.tools.r8.shaking.RootSetBuilder$1):1747:1747 -> <init>
+    2:32:void <init>(com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,com.android.tools.r8.utils.PredicateSet,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Map,java.util.Set,java.util.Set,java.util.List):1802:1832 -> <init>
     1:1:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> a
-    1:1:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1909 -> a
-    2:14:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1910:1922 -> a
+    1:1:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1919 -> a
+    2:14:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1920:1932 -> a
     15:15:boolean com.android.tools.r8.graph.DexDefinition.isDexEncodedField():0:0 -> a
-    15:15:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1923 -> a
-    16:23:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1924:1931 -> a
+    15:15:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1933 -> a
+    16:23:boolean lambda$pruneDeadReferences$4(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer,com.android.tools.r8.graph.DexReference):1934:1941 -> a
     24:113:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    24:113:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1947 -> a
-    114:114:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1948:1948 -> a
-    115:115:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():171:171 -> a
-    115:115:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1950 -> a
-    116:120:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1950:1954 -> a
+    24:113:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1957 -> a
+    114:114:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1958:1958 -> a
+    115:115:boolean com.android.tools.r8.graph.DexEncodedField.isStatic():172:172 -> a
+    115:115:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1960 -> a
+    116:120:void lambda$verifyKeptFieldsAreAccessedAndLive$5(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexField):1960:1964 -> a
     121:409:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):0:288 -> a
-    121:409:void lambda$verifyKeptItemsAreKept$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexMember):2014 -> a
+    121:409:void lambda$verifyKeptItemsAreKept$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexMember):2024 -> a
     410:410:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):292:292 -> a
     410:410:com.android.tools.r8.graph.DexMember com.android.tools.r8.graph.GraphLens.getRenamedMemberSignature(com.android.tools.r8.graph.DexMember):288 -> a
-    410:410:void lambda$verifyKeptItemsAreKept$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexMember):2014 -> a
-    411:415:void lambda$verifyKeptItemsAreKept$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexMember):2015:2019 -> a
-    416:424:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1827:1835 -> a
-    425:437:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1843:1855 -> a
-    438:439:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1853:1854 -> a
-    440:440:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1854:1854 -> a
-    441:441:void addDependentItems(java.util.Map,java.util.Map):1862:1862 -> a
-    442:442:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1865:1865 -> a
-    443:444:void lambda$addDependentItems$3(java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1865:1866 -> a
-    445:449:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1896:1900 -> a
-    450:450:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1907:1907 -> a
-    451:451:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1945:1945 -> a
-    452:452:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1607:1607 -> a
-    452:452:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1945 -> a
-    453:454:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1963:1964 -> a
-    455:544:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    455:544:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1966 -> a
-    545:549:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1966:1970 -> a
-    550:550:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):1980:1980 -> a
-    551:552:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):604:605 -> a
-    551:552:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):1980 -> a
-    553:554:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):1980:1981 -> a
-    555:555:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1987:1987 -> a
-    556:556:boolean com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.containsClass(com.android.tools.r8.graph.DexType):1577:1577 -> a
-    556:556:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1987 -> a
-    557:562:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1990:1995 -> a
-    563:574:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2001:2012 -> a
-    575:575:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1607:1607 -> a
-    575:575:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1617 -> a
-    575:575:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2012 -> a
-    576:576:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1630:1630 -> a
-    576:576:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1618 -> a
-    576:576:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2012 -> a
-    577:618:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2023:2064 -> a
-    619:619:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    619:619:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2065 -> a
-    620:623:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2066:2069 -> a
-    624:627:void lambda$verifyKeptItemsAreKept$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType):2007:2010 -> a
-    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1961:1961 -> b
-    2:2:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1630:1630 -> b
-    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1961 -> b
-    3:3:java.util.Set lambda$verifyKeptItemsAreKept$10(com.android.tools.r8.graph.DexType):2018:2018 -> b
-    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1978:1978 -> c
-    2:2:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):2010:2010 -> c
-    1:3:java.lang.String toString():2077:2079 -> toString
-    4:4:int com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.size():1693:1693 -> toString
-    4:4:java.lang.String toString():2079 -> toString
-    5:14:java.lang.String toString():2079:2088 -> toString
-com.android.tools.r8.shaking.RootSetBuilder$RootSetBase -> com.android.tools.r8.shaking.B1$f:
+    410:410:void lambda$verifyKeptItemsAreKept$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexMember):2024 -> a
+    411:415:void lambda$verifyKeptItemsAreKept$11(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexMember):2025:2029 -> a
+    416:424:void checkAllRulesAreUsed(com.android.tools.r8.utils.InternalOptions):1836:1844 -> a
+    425:437:void addConsequentRootSet(com.android.tools.r8.shaking.RootSetBuilder$ConsequentRootSet,boolean):1852:1864 -> a
+    438:439:void lambda$addConsequentRootSet$1(com.android.tools.r8.graph.DexType,java.util.Set):1862:1863 -> a
+    440:440:java.util.Set lambda$addConsequentRootSet$0(com.android.tools.r8.graph.DexType):1863:1863 -> a
+    441:441:void addDependentItems(java.util.Map,java.util.Map):1871:1871 -> a
+    442:442:com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules lambda$addDependentItems$2(com.android.tools.r8.graph.DexReference):1874:1874 -> a
+    443:444:void lambda$addDependentItems$3(java.util.Map,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules):1874:1875 -> a
+    445:450:void pruneDeadItems(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1905:1910 -> a
+    451:451:void pruneDeadReferences(java.util.Set,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.Enqueuer):1917:1917 -> a
+    452:452:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1955:1955 -> a
+    453:453:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1613:1613 -> a
+    453:453:boolean verifyKeptFieldsAreAccessedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1955 -> a
+    454:455:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1973:1974 -> a
+    456:545:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
+    456:545:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1976 -> a
+    546:550:void lambda$verifyKeptMethodsAreTargetedAndLive$6(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexMethod):1976:1980 -> a
+    551:551:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):1990:1990 -> a
+    552:553:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLiveProgramType(com.android.tools.r8.graph.DexType):615:616 -> a
+    552:553:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):1990 -> a
+    554:555:void lambda$verifyKeptTypesAreLive$7(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexType):1990:1991 -> a
+    556:556:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1997:1997 -> a
+    557:557:boolean com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.containsClass(com.android.tools.r8.graph.DexType):1583:1583 -> a
+    557:557:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):1997 -> a
+    558:563:boolean isKeptDirectlyOrIndirectly(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.AppInfoWithLiveness):2000:2005 -> a
+    564:575:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2011:2022 -> a
+    576:576:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.Consumer):1613:1613 -> a
+    576:576:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1623 -> a
+    576:576:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2022 -> a
+    577:577:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1636:1636 -> a
+    577:577:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.Consumer):1624 -> a
+    577:577:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2022 -> a
+    578:619:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2033:2074 -> a
+    620:620:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    620:620:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2075 -> a
+    621:624:boolean verifyKeptItemsAreKept(com.android.tools.r8.graph.AppView):2076:2079 -> a
+    625:628:void lambda$verifyKeptItemsAreKept$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.AppInfoWithClassHierarchy,java.util.Map,com.android.tools.r8.graph.DexType):2017:2020 -> a
+    1:1:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1971:1971 -> b
+    2:2:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.Consumer):1636:1636 -> b
+    2:2:boolean verifyKeptMethodsAreTargetedAndLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1971 -> b
+    3:3:java.util.Set lambda$verifyKeptItemsAreKept$10(com.android.tools.r8.graph.DexType):2028:2028 -> b
+    1:1:boolean verifyKeptTypesAreLive(com.android.tools.r8.shaking.AppInfoWithLiveness):1988:1988 -> c
+    2:2:java.util.Set lambda$verifyKeptItemsAreKept$8(com.android.tools.r8.graph.DexType):2020:2020 -> c
+    1:3:java.lang.String toString():2087:2089 -> toString
+    4:4:int com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.size():1699:1699 -> toString
+    4:4:java.lang.String toString():2089 -> toString
+    5:14:java.lang.String toString():2089:2098 -> toString
+com.android.tools.r8.shaking.RootSetBuilder$RootSetBase -> com.android.tools.r8.shaking.E1$f:
     java.util.Set noObfuscation -> e
     java.util.List delayedRootSetActionItems -> i
     java.util.Set neverInline -> a
@@ -75073,33 +75607,33 @@
     java.util.Map dependentNoShrinking -> f
     java.util.Map dependentSoftPinned -> g
     java.util.Map dependentKeepClassCompatRule -> h
-    1:10:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.List):1346:1355 -> <init>
+    1:10:void <init>(java.util.Set,java.util.Set,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules,java.util.Set,java.util.Map,java.util.Map,java.util.Map,java.util.List):1352:1361 -> <init>
     1:90:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    1:90:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1398 -> a
-    91:95:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1398:1402 -> a
+    1:90:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1404 -> a
+    91:95:void lambda$forEachDependentInstanceConstructor$1(com.android.tools.r8.graph.AppView,java.util.function.BiConsumer,com.android.tools.r8.graph.DexMethod,java.util.Set):1404:1408 -> a
     96:185:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> a
-    96:185:void lambda$forEachDependentMember$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexMember,java.util.Set):1416 -> a
-    186:190:void lambda$forEachDependentMember$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexMember,java.util.Set):1416:1420 -> a
-    191:191:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):1374:1374 -> a
-    192:199:void lambda$forEachMemberWithDependentItems$0(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):1376:1383 -> a
-    200:201:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1394:1395 -> a
-    202:202:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1635:1635 -> a
-    202:202:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1395 -> a
-    203:204:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1412:1413 -> a
-    205:205:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1612:1612 -> a
-    205:205:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1624 -> a
-    205:205:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1413 -> a
-    206:206:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1635:1635 -> a
-    206:206:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1625 -> a
-    206:206:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1413 -> a
-    207:208:void lambda$forEachDependentNonStaticMember$3(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexEncodedMember,java.util.Set):1434:1435 -> a
-    209:209:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1455:1455 -> a
-    210:210:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules.empty():1467:1467 -> a
-    210:210:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1456 -> a
-    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1430:1430 -> b
-    2:3:void lambda$forEachDependentStaticMember$4(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexEncodedMember,java.util.Set):1448:1449 -> b
-    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1444:1444 -> c
-com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.B1$g:
+    96:185:void lambda$forEachDependentMember$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexMember,java.util.Set):1422 -> a
+    186:190:void lambda$forEachDependentMember$2(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexMember,java.util.Set):1422:1426 -> a
+    191:191:void forEachMemberWithDependentItems(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer):1380:1380 -> a
+    192:199:void lambda$forEachMemberWithDependentItems$0(com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.BiConsumer,com.android.tools.r8.graph.DexReference,com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules):1382:1389 -> a
+    200:201:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1400:1401 -> a
+    202:202:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1641:1641 -> a
+    202:202:void forEachDependentInstanceConstructor(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView,java.util.function.BiConsumer):1401 -> a
+    203:204:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1418:1419 -> a
+    205:205:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachField(java.util.function.BiConsumer):1618:1618 -> a
+    205:205:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1630 -> a
+    205:205:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1419 -> a
+    206:206:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMethod(java.util.function.BiConsumer):1641:1641 -> a
+    206:206:void com.android.tools.r8.shaking.RootSetBuilder$MutableItemsWithRules.forEachMember(java.util.function.BiConsumer):1631 -> a
+    206:206:void forEachDependentMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1419 -> a
+    207:208:void lambda$forEachDependentNonStaticMember$3(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexEncodedMember,java.util.Set):1440:1441 -> a
+    209:209:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1461:1461 -> a
+    210:210:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules.empty():1473:1473 -> a
+    210:210:com.android.tools.r8.shaking.RootSetBuilder$ItemsWithRules getDependentItems(com.android.tools.r8.graph.DexDefinition):1462 -> a
+    1:1:void forEachDependentNonStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1436:1436 -> b
+    2:3:void lambda$forEachDependentStaticMember$4(com.android.tools.r8.utils.Consumer3,com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.DexEncodedMember,java.util.Set):1454:1455 -> b
+    1:1:void forEachDependentStaticMember(com.android.tools.r8.graph.DexDefinition,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.Consumer3):1450:1450 -> c
+com.android.tools.r8.shaking.RootSetBuilder$SynthesizeMissingInterfaceMethodsForMemberRules -> com.android.tools.r8.shaking.E1$g:
     java.util.Set seenMethods -> g
     com.android.tools.r8.shaking.ProguardConfigurationRule context -> d
     java.util.Set seenTypes -> h
@@ -75109,23 +75643,23 @@
     com.android.tools.r8.graph.DexProgramClass originalClazz -> b
     boolean $assertionsDisabled -> a
     java.util.Map preconditionSupplier -> e
-    1:1:void <clinit>():517:517 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetBuilder$1):517:517 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):531:531 -> <init>
-    3:18:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):523:538 -> <init>
+    1:1:void <clinit>():520:520 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule,com.android.tools.r8.shaking.RootSetBuilder$1):520:520 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):534:534 -> <init>
+    3:18:void <init>(com.android.tools.r8.shaking.RootSetBuilder,com.android.tools.r8.graph.DexProgramClass,java.util.Collection,com.android.tools.r8.shaking.ProguardConfigurationRule,java.util.Map,com.android.tools.r8.shaking.ProguardIfRule):526:541 -> <init>
     void handleMatchedAnnotation(com.android.tools.r8.shaking.AnnotationMatchResult) -> a
-    1:1:void run():546:546 -> a
-    2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):550:550 -> a
-    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    3:3:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):550 -> a
-    4:25:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):551:572 -> a
-    26:50:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):579:603 -> a
-    51:53:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):608:610 -> a
+    1:1:void run():549:549 -> a
+    2:2:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):553:553 -> a
+    3:3:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    3:3:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):553 -> a
+    4:25:void visitAllSuperInterfaces(com.android.tools.r8.graph.DexType):554:575 -> a
+    26:50:void tryAndKeepMethodOnClass(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.shaking.ProguardMemberRule):582:606 -> a
+    51:53:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):611:613 -> a
     54:54:void com.android.tools.r8.logging.Log.verbose(java.lang.Class,java.lang.String,java.lang.Object[]):22:22 -> a
-    54:54:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):609 -> a
-    55:57:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):617:619 -> a
-    58:58:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):618:618 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.sx:
+    54:54:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):612 -> a
+    55:57:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):620:622 -> a
+    58:58:void lambda$tryAndKeepMethodOnClass$0(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.shaking.RootSetBuilder):621:621 -> a
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo -> com.android.tools.r8.internal.Lx:
     java.util.Set exceptionGuardTypes -> c
     java.util.Set instanceOfTypes -> a
     java.util.Set checkCastTypes -> b
@@ -75137,7 +75671,7 @@
     3:3:boolean com.android.tools.r8.shaking.RuntimeTypeCheckInfo.isExceptionGuardType(com.android.tools.r8.graph.DexProgramClass):82:82 -> a
     3:3:boolean isRuntimeCheckType(com.android.tools.r8.graph.DexProgramClass):86 -> a
     4:7:com.android.tools.r8.shaking.RuntimeTypeCheckInfo rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):90:93 -> a
-com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.sx$a:
+com.android.tools.r8.shaking.RuntimeTypeCheckInfo$Builder -> com.android.tools.r8.internal.Lx$a:
     java.util.Set checkCastTypes -> c
     java.util.Set exceptionGuardTypes -> d
     java.util.Set instanceOfTypes -> b
@@ -75148,7 +75682,7 @@
     2:2:void traceCheckCast(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):52:52 -> a
     1:1:void traceExceptionGuard(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):62:62 -> b
     1:1:void traceInstanceOf(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.ProgramMethod):57:57 -> c
-com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.C1:
+com.android.tools.r8.shaking.ScopedDexMethodSet -> com.android.tools.r8.shaking.F1:
     java.util.Map items -> c
     com.android.tools.r8.com.google.common.base.Equivalence METHOD_EQUIVALENCE -> a
     com.android.tools.r8.shaking.ScopedDexMethodSet parent -> b
@@ -75164,13 +75698,13 @@
     24:24:com.android.tools.r8.shaking.ScopedDexMethodSet getParent():75:75 -> a
     25:25:void setParent(com.android.tools.r8.shaking.ScopedDexMethodSet):79:79 -> a
     1:1:com.android.tools.r8.shaking.ScopedDexMethodSet newNestedScope():36:36 -> b
-com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.shaking.C1$a:
+com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult -> com.android.tools.r8.shaking.F1$a:
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_NOT_EXISTING -> b
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult ADDED_MORE_VISIBLE -> c
     com.android.tools.r8.shaking.ScopedDexMethodSet$AddMethodIfMoreVisibleResult NOT_ADDED -> a
     1:3:void <clinit>():17:19 -> <clinit>
     1:1:void <init>(java.lang.String,int):16:16 -> <init>
-com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.ey:
+com.android.tools.r8.shaking.SingleTargetLookupCache -> com.android.tools.r8.internal.xy:
     java.util.Map cache -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -75183,7 +75717,7 @@
     17:17:void lambda$removeInstantiatedType$3(com.android.tools.r8.ir.desugar.LambdaDescriptor):47:47 -> a
     18:23:com.android.tools.r8.graph.DexEncodedMethod getCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):52:57 -> a
     1:5:boolean hasCachedItem(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):61:65 -> b
-com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.internal.Hy:
+com.android.tools.r8.shaking.StaticClassMerger -> com.android.tools.r8.internal.az:
     com.android.tools.r8.graph.AppView appView -> b
     int numberOfMergedClasses -> i
     com.android.tools.r8.shaking.MainDexTracingResult mainDexClasses -> c
@@ -75202,54 +75736,54 @@
     10:20:com.android.tools.r8.graph.GraphLens$NestedGraphLens com.android.tools.r8.shaking.StaticClassMerger.buildGraphLens():231:241 -> a
     10:20:com.android.tools.r8.graph.GraphLens$NestedGraphLens run():227 -> a
     21:21:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):251:251 -> a
-    22:262:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:240 -> a
-    22:262:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):251 -> a
-    263:316:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):255:308 -> a
-    317:317:boolean lambda$getMergeGroup$0(com.android.tools.r8.graph.DexEncodedField):267:267 -> a
-    318:318:boolean lambda$getMergeGroup$1(com.android.tools.r8.graph.DexEncodedMethod):273:273 -> a
-    319:327:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.graph.DexProgramClass):373:381 -> a
-    328:335:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):385:392 -> a
-    336:347:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):388:399 -> a
-    348:356:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):394:402 -> a
-    357:362:com.android.tools.r8.utils.TraversalContinuation lambda$mayMergeAcrossPackageBoundaries$6(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):432:437 -> a
-    363:368:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):444:449 -> a
-    369:377:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):445:453 -> a
-    378:378:boolean com.android.tools.r8.graph.AccessFlags.isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):101:101 -> a
-    378:378:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):453 -> a
-    379:381:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):453:455 -> a
-    382:382:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.shaking.StaticClassMerger.getClassToFeatureSplitMap():247:247 -> a
-    382:382:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):456 -> a
-    383:383:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):109:109 -> a
-    383:383:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):456 -> a
-    384:390:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):456:462 -> a
-    391:394:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):461:464 -> a
-    395:398:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):463:466 -> a
-    399:405:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):465:471 -> a
-    406:416:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):479:489 -> a
-    417:430:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.StaticClassMerger.renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):545:558 -> a
-    417:430:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):491 -> a
-    431:437:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):492:498 -> a
-    438:438:boolean lambda$mergeMethods$7(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):486:486 -> a
-    439:457:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):507:525 -> a
-    458:470:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.StaticClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):565:577 -> a
-    458:470:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):527 -> a
-    471:480:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):528:537 -> a
-    481:481:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$8(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):519:519 -> a
-    482:482:boolean lambda$mergeFields$9(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):523:523 -> a
+    22:260:boolean com.android.tools.r8.synthesis.SyntheticItems.isSyntheticClass(com.android.tools.r8.graph.DexProgramClass):0:238 -> a
+    22:260:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):251 -> a
+    261:314:com.android.tools.r8.shaking.StaticClassMerger$MergeGroup getMergeGroup(com.android.tools.r8.graph.DexProgramClass):255:308 -> a
+    315:315:boolean lambda$getMergeGroup$0(com.android.tools.r8.graph.DexEncodedField):267:267 -> a
+    316:316:boolean lambda$getMergeGroup$1(com.android.tools.r8.graph.DexEncodedMethod):273:273 -> a
+    317:325:com.android.tools.r8.shaking.StaticClassMerger$Representative getOrCreateRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.graph.DexProgramClass):373:381 -> a
+    326:333:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):385:392 -> a
+    334:345:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):388:399 -> a
+    346:354:void setRepresentative(com.android.tools.r8.shaking.StaticClassMerger$MergeKey,com.android.tools.r8.shaking.StaticClassMerger$Representative):394:402 -> a
+    355:360:com.android.tools.r8.utils.TraversalContinuation lambda$mayMergeAcrossPackageBoundaries$6(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):432:437 -> a
+    361:366:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):444:449 -> a
+    367:375:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):445:453 -> a
+    376:376:boolean com.android.tools.r8.graph.AccessFlags.isAtLeastAsVisibleAs(com.android.tools.r8.graph.AccessFlags):101:101 -> a
+    376:376:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):453 -> a
+    377:379:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):453:455 -> a
+    380:380:com.android.tools.r8.features.ClassToFeatureSplitMap com.android.tools.r8.shaking.StaticClassMerger.getClassToFeatureSplitMap():247:247 -> a
+    380:380:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):456 -> a
+    381:381:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):110:110 -> a
+    381:381:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):456 -> a
+    382:388:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):456:462 -> a
+    389:392:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):461:464 -> a
+    393:396:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):463:466 -> a
+    397:403:void moveMembersFromSourceToTarget(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):465:471 -> a
+    404:414:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):479:489 -> a
+    415:428:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.StaticClassMerger.renameMethodIfNeeded(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):545:558 -> a
+    415:428:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):491 -> a
+    429:435:java.util.List mergeMethods(java.lang.Iterable,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass):492:498 -> a
+    436:436:boolean lambda$mergeMethods$7(java.util.Set,com.android.tools.r8.utils.MethodSignatureEquivalence,com.android.tools.r8.graph.DexMethod):486:486 -> a
+    437:455:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):507:525 -> a
+    456:468:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.StaticClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexProgramClass,java.util.function.Predicate):565:577 -> a
+    456:468:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):527 -> a
+    469:478:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.List,java.util.List,com.android.tools.r8.graph.DexProgramClass):528:537 -> a
+    479:479:com.android.tools.r8.com.google.common.base.Equivalence$Wrapper lambda$mergeFields$8(com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexEncodedField):519:519 -> a
+    480:480:boolean lambda$mergeFields$9(java.util.Set,com.android.tools.r8.utils.FieldSignatureEquivalence,com.android.tools.r8.graph.DexField):523:523 -> a
     1:1:com.android.tools.r8.com.google.common.base.Equivalence access$100(com.android.tools.r8.shaking.StaticClassMerger):62:62 -> b
-    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> b
+    2:2:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():180:180 -> b
     2:2:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedField):417 -> b
-    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> b
+    3:3:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():188:188 -> b
     3:3:boolean lambda$mayMergeAcrossPackageBoundaries$4(com.android.tools.r8.graph.DexEncodedField):417 -> b
     4:4:boolean isValidRepresentative(com.android.tools.r8.graph.DexProgramClass):322:322 -> b
-    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():480:480 -> b
+    5:5:boolean com.android.tools.r8.graph.DexEncodedMethod.isNative():484:484 -> b
     5:5:boolean lambda$getMergeGroup$2(com.android.tools.r8.graph.DexEncodedMethod):283 -> b
     6:11:boolean lambda$getMergeGroup$2(com.android.tools.r8.graph.DexEncodedMethod):283:288 -> b
-    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> c
+    1:1:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():488:488 -> c
     1:1:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):414 -> c
-    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> c
+    2:2:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> c
     2:2:boolean lambda$mayMergeAcrossPackageBoundaries$3(com.android.tools.r8.graph.DexEncodedMethod):414 -> c
-    3:3:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> c
+    3:3:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> c
     3:3:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):408 -> c
     4:30:boolean mayMergeAcrossPackageBoundaries(com.android.tools.r8.graph.DexProgramClass):413:439 -> c
     1:2:void merge(com.android.tools.r8.graph.DexProgramClass):326:327 -> d
@@ -75270,9 +75804,9 @@
     26:26:void merge(com.android.tools.r8.graph.DexProgramClass):328 -> d
     27:45:void com.android.tools.r8.shaking.StaticClassMerger.merge(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.StaticClassMerger$MergeGroup):350:368 -> d
     27:45:void merge(com.android.tools.r8.graph.DexProgramClass):328 -> d
-    46:46:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> d
+    46:46:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():488:488 -> d
     46:46:boolean lambda$mayMergeAcrossPackageBoundaries$5(com.android.tools.r8.graph.DexEncodedMethod):425 -> d
-com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.internal.Ey:
+com.android.tools.r8.shaking.StaticClassMerger$MergeGroup -> com.android.tools.r8.internal.Xy:
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup DONT_MERGE -> d
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup[] $VALUES -> e
     boolean $assertionsDisabled -> f
@@ -75282,7 +75816,7 @@
     1:6:void <clinit>():64:64 -> <clinit>
     1:1:void <init>(java.lang.String,int):64:64 -> <init>
     1:9:java.lang.String toString():72:80 -> toString
-com.android.tools.r8.shaking.StaticClassMerger$MergeKey -> com.android.tools.r8.internal.Fy:
+com.android.tools.r8.shaking.StaticClassMerger$MergeKey -> com.android.tools.r8.internal.Yy:
     com.android.tools.r8.FeatureSplit featureSplit -> a
     java.lang.String packageOrGlobal -> c
     com.android.tools.r8.shaking.StaticClassMerger$MergeGroup mergeGroup -> b
@@ -75294,7 +75828,7 @@
     1:1:com.android.tools.r8.shaking.StaticClassMerger$MergeKey toGlobal():105:105 -> d
     1:7:boolean equals(java.lang.Object):126:132 -> equals
     1:1:int hashCode():118:118 -> hashCode
-com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.internal.Gy:
+com.android.tools.r8.shaking.StaticClassMerger$Representative -> com.android.tools.r8.internal.Zy:
     com.android.tools.r8.graph.DexProgramClass clazz -> b
     com.android.tools.r8.shaking.StaticClassMerger this$0 -> f
     boolean hasSynchronizedMethods -> e
@@ -75310,10 +75844,10 @@
     5:5:boolean com.android.tools.r8.com.google.common.collect.HashMultiset.add(java.lang.Object):33 -> a
     5:5:void include(com.android.tools.r8.graph.DexProgramClass):161 -> a
     6:7:void include(com.android.tools.r8.graph.DexProgramClass):164:165 -> a
-    8:8:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    8:8:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
     8:8:void include(com.android.tools.r8.graph.DexProgramClass):165 -> a
     9:9:void include(com.android.tools.r8.graph.DexProgramClass):165:165 -> a
-    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
+    10:10:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
     10:10:void include(com.android.tools.r8.graph.DexProgramClass):166 -> a
     11:12:void include(com.android.tools.r8.graph.DexProgramClass):167:168 -> a
     13:13:boolean com.android.tools.r8.com.google.common.collect.AbstractMultiset.add(java.lang.Object):84:84 -> a
@@ -75322,7 +75856,7 @@
     14:14:void include(com.android.tools.r8.graph.DexProgramClass):170:170 -> a
     15:19:boolean isFull():179:183 -> a
     1:1:com.android.tools.r8.graph.DexProgramClass access$300(com.android.tools.r8.shaking.StaticClassMerger$Representative):141:141 -> b
-com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.shaking.D1:
+com.android.tools.r8.shaking.TreePruner -> com.android.tools.r8.internal.hB:
     java.util.Set methodsToKeepForConfigurationDebugging -> g
     com.android.tools.r8.graph.AppView appView -> b
     com.android.tools.r8.shaking.TreePrunerConfiguration configuration -> c
@@ -75336,100 +75870,100 @@
     3:21:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.shaking.TreePrunerConfiguration):40:58 -> <init>
     1:1:void lambda$new$0(com.android.tools.r8.utils.InternalOptions,java.lang.String):56:56 -> a
     2:3:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):77:78 -> a
-    4:27:java.util.List getNewProgramClasses(java.util.List):82:105 -> a
+    4:27:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.List):82:105 -> a
     4:27:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78 -> a
-    28:39:void pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):124:135 -> a
-    28:39:java.util.List getNewProgramClasses(java.util.List):108 -> a
+    28:39:void com.android.tools.r8.shaking.TreePruner.pruneUnusedInterfaces(com.android.tools.r8.graph.DexProgramClass):124:135 -> a
+    28:39:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.List):108 -> a
     28:39:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78 -> a
-    40:50:java.util.List getNewProgramClasses(java.util.List):109:119 -> a
+    40:50:java.util.List com.android.tools.r8.shaking.TreePruner.getNewProgramClasses(java.util.List):109:119 -> a
     40:50:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78 -> a
     51:51:com.android.tools.r8.graph.DirectMappedDexApplication$Builder removeUnused(com.android.tools.r8.graph.DirectMappedDexApplication):78:78 -> a
     52:52:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):141:141 -> a
-    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    53:53:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     53:53:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):141 -> a
     54:61:void removeInterfacesImplementedDirectlyAndIndirectlyByClassFromSet(com.android.tools.r8.graph.DexType,java.util.Set):145:152 -> a
     62:63:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):170:171 -> a
     64:69:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):19:24 -> a
-    64:69:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275 -> a
+    64:69:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):274 -> a
     64:69:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171 -> a
-    70:70:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275:275 -> a
+    70:70:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):274:274 -> a
     70:70:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):171 -> a
     71:74:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):173:176 -> a
     75:80:java.util.List com.android.tools.r8.utils.IterableUtils.ensureUnmodifiableList(java.lang.Iterable):19:24 -> a
-    75:80:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275 -> a
+    75:80:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):274 -> a
     75:80:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):176 -> a
-    81:81:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):275:275 -> a
+    81:81:com.android.tools.r8.graph.DexEncodedMethod[] com.android.tools.r8.shaking.TreePruner.reachableMethods(java.lang.Iterable,com.android.tools.r8.graph.DexClass):274:274 -> a
     81:81:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):176 -> a
     82:93:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):178:189 -> a
-    94:101:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):196:203 -> a
+    94:101:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):196:203 -> a
     94:101:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
-    102:102:void claimNestOwnership(com.android.tools.r8.graph.DexClass):228:228 -> a
-    102:102:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    102:102:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):228:228 -> a
+    102:102:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
     102:102:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
-    103:103:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    103:103:void claimNestOwnership(com.android.tools.r8.graph.DexClass):228 -> a
-    103:103:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    103:103:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    103:103:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):228 -> a
+    103:103:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
     103:103:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
-    104:107:void claimNestOwnership(com.android.tools.r8.graph.DexClass):233:236 -> a
-    104:107:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    104:107:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):233:236 -> a
+    104:107:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
     104:107:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
-    108:108:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    108:108:void claimNestOwnership(com.android.tools.r8.graph.DexClass):236 -> a
-    108:108:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    108:108:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    108:108:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):236 -> a
+    108:108:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
     108:108:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
-    109:115:void claimNestOwnership(com.android.tools.r8.graph.DexClass):238:244 -> a
-    109:115:void rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
+    109:115:void com.android.tools.r8.shaking.TreePruner.claimNestOwnership(com.android.tools.r8.graph.DexClass):238:244 -> a
+    109:115:void com.android.tools.r8.shaking.TreePruner.rewriteNestAttributes(com.android.tools.r8.graph.DexProgramClass):204 -> a
     109:115:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):190 -> a
     116:117:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):191:192 -> a
-    118:120:boolean verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):381:383 -> a
+    118:120:boolean com.android.tools.r8.shaking.TreePruner.verifyNoDeadFields(com.android.tools.r8.graph.DexProgramClass):380:382 -> a
     118:120:void pruneMembersAndAttributes(com.android.tools.r8.graph.DexProgramClass):192 -> a
     121:121:boolean isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> a
     122:123:void clearDeadNestMembers(com.android.tools.r8.graph.DexClass):220:221 -> a
     124:124:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):223:223 -> a
-    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    125:125:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     125:125:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):223 -> a
     126:126:boolean lambda$clearDeadNestMembers$1(com.android.tools.r8.graph.NestMemberClassAttribute):224:224 -> a
-    127:130:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):250:253 -> a
-    131:131:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):257:257 -> a
-    132:132:boolean isTypeMissing(com.android.tools.r8.graph.DexType):210:210 -> a
-    132:132:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):257 -> a
-    133:136:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):257:260 -> a
-    137:137:boolean isTypeMissing(com.android.tools.r8.graph.DexType):210:210 -> a
-    137:137:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):261 -> a
-    138:138:boolean isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> a
-    138:138:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):261 -> a
-    139:140:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):266:267 -> a
-    141:162:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):279:300 -> a
-    163:180:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):297:314 -> a
-    181:181:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():476:476 -> a
-    181:181:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315 -> a
-    182:184:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):315:317 -> a
-    185:185:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():492:492 -> a
-    185:185:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):318 -> a
-    186:194:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):318:326 -> a
-    195:206:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):325:336 -> a
-    207:207:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):282:282 -> a
-    208:237:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):340:369 -> a
-    238:238:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):342:342 -> a
-    239:239:java.util.Collection getMethodsToKeepForConfigurationDebugging():377:377 -> a
-    1:1:boolean isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> b
+    127:129:boolean isAttributeReferencingPrunedItem(com.android.tools.r8.graph.EnclosingMethodAttribute):250:252 -> a
+    130:130:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):256:256 -> a
+    131:131:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):210:210 -> a
+    131:131:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):256 -> a
+    132:135:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):256:259 -> a
+    136:136:boolean com.android.tools.r8.shaking.TreePruner.isTypeMissing(com.android.tools.r8.graph.DexType):210:210 -> a
+    136:136:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):260 -> a
+    137:137:boolean com.android.tools.r8.shaking.TreePruner.isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> a
+    137:137:boolean isAttributeReferencingMissingOrPrunedType(com.android.tools.r8.graph.InnerClassAttribute):260 -> a
+    138:139:int firstUnreachableIndex(java.util.List,java.util.function.Predicate):265:266 -> a
+    140:161:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):278:299 -> a
+    162:179:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):296:313 -> a
+    180:180:boolean com.android.tools.r8.graph.DexEncodedMethod.isFinal():480:480 -> a
+    180:180:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):314 -> a
+    181:183:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):314:316 -> a
+    184:184:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():496:496 -> a
+    184:184:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):317 -> a
+    185:193:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):317:325 -> a
+    194:205:com.android.tools.r8.graph.DexEncodedMethod[] reachableMethods(java.util.List,com.android.tools.r8.graph.DexClass):324:335 -> a
+    206:206:boolean lambda$reachableMethods$2(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedMethod):281:281 -> a
+    207:236:com.android.tools.r8.graph.DexEncodedField[] reachableFields(java.util.List):339:368 -> a
+    237:237:boolean lambda$reachableFields$3(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField):341:341 -> a
+    238:238:java.util.Collection getMethodsToKeepForConfigurationDebugging():376:376 -> a
+    1:1:boolean com.android.tools.r8.shaking.TreePruner.isTypeLive(com.android.tools.r8.graph.DexType):214:214 -> b
     1:1:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):157 -> b
     2:8:void retainReachableInterfacesFrom(com.android.tools.r8.graph.DexType,java.util.Set):158:164 -> b
-    9:9:java.util.Set getRemovedClasses():373:373 -> b
+    9:9:java.util.Set getRemovedClasses():372:372 -> b
     1:10:com.android.tools.r8.graph.DirectMappedDexApplication run():62:71 -> c
-com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.OA:
+com.android.tools.r8.shaking.TreePrunerConfiguration -> com.android.tools.r8.internal.iB:
     boolean isReachableOrReferencedField(com.android.tools.r8.shaking.AppInfoWithLiveness,com.android.tools.r8.graph.DexEncodedField) -> a
-com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.G1:
+com.android.tools.r8.shaking.UnusedArgumentRule -> com.android.tools.r8.shaking.I1:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.UnusedArgumentRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.shaking.E1:
-com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.F1:
+com.android.tools.r8.shaking.UnusedArgumentRule$1 -> com.android.tools.r8.shaking.G1:
+com.android.tools.r8.shaking.UnusedArgumentRule$Builder -> com.android.tools.r8.shaking.H1:
     1:1:void <init>(com.android.tools.r8.shaking.UnusedArgumentRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.shaking.K1:
+com.android.tools.r8.shaking.UnusedItemsPrinter -> com.android.tools.r8.internal.KC:
     com.android.tools.r8.shaking.UnusedItemsPrinter$Members currentMembers -> e
     java.util.List classes -> f
     java.util.function.Consumer consumer -> c
@@ -75442,55 +75976,55 @@
     1:2:void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass):48:49 -> a
     3:17:void finished():76:90 -> a
     18:18:int lambda$finished$0(com.android.tools.r8.utils.Pair,com.android.tools.r8.utils.Pair):76:76 -> a
-    19:19:void append(java.lang.String):94:94 -> a
+    19:19:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     19:19:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):123 -> a
     20:21:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):124:125 -> a
-    22:22:void append(java.lang.String):94:94 -> a
+    22:22:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     22:22:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):126 -> a
-    23:23:void append(java.lang.String):94:94 -> a
+    23:23:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     23:23:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):127 -> a
     24:24:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):129:129 -> a
-    25:25:void append(java.lang.String):94:94 -> a
+    25:25:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     25:25:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):129 -> a
-    26:26:void append(java.lang.String):94:94 -> a
+    26:26:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     26:26:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):130 -> a
     27:27:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):131:131 -> a
-    28:28:void append(java.lang.String):94:94 -> a
+    28:28:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     28:28:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):131 -> a
-    29:29:void newline():98:98 -> a
+    29:29:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98:98 -> a
     29:29:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):132 -> a
-    30:30:void append(java.lang.String):94:94 -> a
-    30:30:void newline():98 -> a
+    30:30:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    30:30:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98 -> a
     30:30:void printUnusedField(com.android.tools.r8.graph.DexEncodedField):132 -> a
-    31:31:void append(java.lang.String):94:94 -> a
+    31:31:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     31:31:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):102 -> a
     32:33:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):103:104 -> a
-    34:34:void append(java.lang.String):94:94 -> a
+    34:34:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     34:34:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):105 -> a
-    35:35:void append(java.lang.String):94:94 -> a
+    35:35:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     35:35:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):106 -> a
     36:36:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):108:108 -> a
-    37:37:void append(java.lang.String):94:94 -> a
+    37:37:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     37:37:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):108 -> a
-    38:38:void append(java.lang.String):94:94 -> a
+    38:38:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     38:38:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):109 -> a
     39:39:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):110:110 -> a
-    40:40:void append(java.lang.String):94:94 -> a
+    40:40:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     40:40:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):110 -> a
-    41:41:void append(java.lang.String):94:94 -> a
+    41:41:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     41:41:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):111 -> a
     42:42:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):112:112 -> a
-    43:43:void append(java.lang.String):94:94 -> a
+    43:43:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     43:43:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):114 -> a
     44:44:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):116:116 -> a
-    45:45:void append(java.lang.String):94:94 -> a
+    45:45:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     45:45:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):116 -> a
-    46:46:void append(java.lang.String):94:94 -> a
+    46:46:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
     46:46:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):118 -> a
-    47:47:void newline():98:98 -> a
+    47:47:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98:98 -> a
     47:47:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):119 -> a
-    48:48:void append(java.lang.String):94:94 -> a
-    48:48:void newline():98 -> a
+    48:48:void com.android.tools.r8.shaking.UnusedItemsPrinter.append(java.lang.String):94:94 -> a
+    48:48:void com.android.tools.r8.shaking.UnusedItemsPrinter.newline():98 -> a
     48:48:void printUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):119 -> a
     1:2:void visiting(com.android.tools.r8.graph.DexProgramClass):54:55 -> b
     3:3:void visited():60:60 -> b
@@ -75499,18 +76033,18 @@
     5:8:void visited():61:64 -> b
     9:9:void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod):68:68 -> b
     10:10:void registerUnusedField(com.android.tools.r8.graph.DexEncodedField):72:72 -> b
-com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.shaking.H1:
-com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.shaking.I1:
+com.android.tools.r8.shaking.UnusedItemsPrinter$1 -> com.android.tools.r8.internal.HC:
+com.android.tools.r8.shaking.UnusedItemsPrinter$Members -> com.android.tools.r8.internal.IC:
     java.util.List methods -> b
     java.util.List fields -> a
     1:3:void <init>():18:20 -> <init>
     4:4:void <init>(com.android.tools.r8.shaking.UnusedItemsPrinter$1):18:18 -> <init>
     1:2:void sort():27:28 -> a
     3:3:int lambda$sort$1(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):28:28 -> a
-    4:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():134:134 -> a
+    4:5:com.android.tools.r8.graph.DexField com.android.tools.r8.graph.DexEncodedField.getReference():135:135 -> a
     4:5:int lambda$sort$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):27 -> a
     6:6:int lambda$sort$0(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedField):27:27 -> a
-com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.shaking.J1:
+com.android.tools.r8.shaking.UnusedItemsPrinter$NopPrinter -> com.android.tools.r8.internal.JC:
     1:1:void <init>():139:139 -> <init>
     void finished() -> a
     void registerUnusedClass(com.android.tools.r8.graph.DexProgramClass) -> a
@@ -75518,7 +76052,7 @@
     void registerUnusedMethod(com.android.tools.r8.graph.DexEncodedMethod) -> b
     void visited() -> b
     void visiting(com.android.tools.r8.graph.DexProgramClass) -> b
-com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.shaking.U1:
+com.android.tools.r8.shaking.VerticalClassMerger -> com.android.tools.r8.internal.tD:
     com.android.tools.r8.shaking.AppInfoWithLiveness appInfo -> c
     java.util.List synthesizedBridges -> p
     java.util.Map mergedClassesInverse -> m
@@ -75541,7 +76075,7 @@
     2:42:void <init>(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing,com.android.tools.r8.shaking.MainDexTracingResult):201:241 -> <init>
     1:1:java.util.Set access$000(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> a
     2:7:void initializeMergeCandidates(java.lang.Iterable):249:254 -> a
-    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    8:8:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     8:8:void initializeMergeCandidates(java.lang.Iterable):254 -> a
     9:22:void initializeMergeCandidates(java.lang.Iterable):254:267 -> a
     23:32:void markTypeAsPinned(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):330:339 -> a
@@ -75550,97 +76084,97 @@
     45:45:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):358 -> a
     46:49:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):358:358 -> a
     53:54:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):362:363 -> a
-    55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):109:109 -> a
+    55:55:boolean com.android.tools.r8.features.ClassToFeatureSplitMap.isInSameFeatureOrBothInBase(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):110:110 -> a
     55:55:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):364 -> a
-    56:63:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):367:374 -> a
-    64:64:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):281:281 -> a
-    64:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):374 -> a
-    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):386:386 -> a
-    66:69:boolean com.android.tools.r8.com.google.common.collect.Iterables.isEmpty(java.lang.Iterable):1023:1026 -> a
-    66:69:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):386 -> a
-    70:99:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):387:416 -> a
-    100:101:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):407:408 -> a
-    102:117:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):427:442 -> a
-    118:129:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):441:452 -> a
-    130:130:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):703:703 -> a
-    130:130:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):452 -> a
-    131:133:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):453:455 -> a
-    134:134:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):703:703 -> a
-    134:134:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):455 -> a
-    135:152:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):456:473 -> a
-    153:170:boolean fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):873:890 -> a
-    153:170:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):479 -> a
-    171:172:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):480:481 -> a
-    173:174:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):466:467 -> a
-    175:176:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):446:447 -> a
-    177:177:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):442:442 -> a
-    178:183:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):530:535 -> a
-    184:200:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():640:656 -> a
-    201:645:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):0:444 -> a
-    201:645:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():656 -> a
-    646:649:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():657:660 -> a
-    650:650:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):656:656 -> a
-    651:656:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):691:696 -> a
-    657:657:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):292:292 -> a
-    657:657:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):697 -> a
-    658:677:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):700:719 -> a
-    678:684:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):774:780 -> a
-    685:685:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):785:785 -> a
-    686:691:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):797:802 -> a
-    692:692:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
-    692:692:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):802 -> a
-    693:752:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):802:861 -> a
-    753:763:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):857:867 -> a
-    764:764:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):863:863 -> a
-    765:765:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):848:848 -> a
-    766:769:void makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1464:1467 -> a
-    766:769:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):96 -> a
-    770:779:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1687:1696 -> a
-    770:779:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):390 -> a
-    780:792:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1692:1704 -> a
-    780:792:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):390 -> a
-    793:801:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1703:1711 -> a
-    793:801:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):390 -> a
-    802:807:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):393:398 -> a
+    56:64:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):367:375 -> a
+    65:65:boolean com.android.tools.r8.graph.AppInfoWithClassHierarchy.isSerializable(com.android.tools.r8.graph.DexType):281:281 -> a
+    65:65:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):376 -> a
+    66:66:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):388:388 -> a
+    67:70:boolean com.android.tools.r8.com.google.common.collect.Iterables.isEmpty(java.lang.Iterable):1023:1026 -> a
+    67:70:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):388 -> a
+    71:100:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):389:418 -> a
+    101:102:boolean isMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.util.Set):409:410 -> a
+    103:118:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):429:444 -> a
+    119:130:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):443:454 -> a
+    131:131:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):762:762 -> a
+    131:131:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):454 -> a
+    132:134:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):455:457 -> a
+    135:135:boolean com.android.tools.r8.shaking.AppInfoWithLiveness.isLockCandidate(com.android.tools.r8.graph.DexType):762:762 -> a
+    135:135:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):457 -> a
+    136:153:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):458:475 -> a
+    154:171:boolean com.android.tools.r8.shaking.VerticalClassMerger.fieldResolutionMayChange(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):875:892 -> a
+    154:171:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):481 -> a
+    172:173:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):482:483 -> a
+    174:175:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):468:469 -> a
+    176:177:boolean isStillMergeCandidate(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):448:449 -> a
+    178:178:boolean lambda$isStillMergeCandidate$1(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):444:444 -> a
+    179:184:com.android.tools.r8.utils.TraversalContinuation lambda$mergeMayLeadToIllegalAccesses$2(com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector,com.android.tools.r8.graph.ProgramMethod):532:537 -> a
+    185:201:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():642:658 -> a
+    202:646:com.android.tools.r8.shaking.KeepInfoCollection com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection.mutate(java.util.function.Consumer):0:444 -> a
+    202:646:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():658 -> a
+    647:650:com.android.tools.r8.shaking.VerticalClassMergerGraphLens run():659:662 -> a
+    651:651:void lambda$run$3(com.android.tools.r8.shaking.KeepInfoCollection$MutableKeepInfoCollection):658:658 -> a
+    652:657:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):693:698 -> a
+    658:658:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.GraphLens.getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod):292:292 -> a
+    658:658:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):699 -> a
+    659:678:boolean verifyGraphLens(com.android.tools.r8.shaking.VerticalClassMergerGraphLens):702:721 -> a
+    679:685:void lambda$methodResolutionMayChange$4(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.Box,com.android.tools.r8.graph.DexClassAndMethod):776:782 -> a
+    686:686:void lambda$methodResolutionMayChange$5(com.android.tools.r8.graph.LookupLambdaTarget):787:787 -> a
+    687:692:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):799:804 -> a
+    693:693:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
+    693:693:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):804 -> a
+    694:753:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):804:863 -> a
+    754:764:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):859:869 -> a
+    765:765:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):865:865 -> a
+    766:766:void mergeClassIfPossible(com.android.tools.r8.graph.DexProgramClass):850:850 -> a
+    767:770:void com.android.tools.r8.shaking.VerticalClassMerger.makePrivate(com.android.tools.r8.graph.DexEncodedMethod):1466:1469 -> a
+    767:770:void access$1200(com.android.tools.r8.graph.DexEncodedMethod):96 -> a
+    771:780:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1689:1698 -> a
+    771:780:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):392 -> a
+    781:793:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1694:1706 -> a
+    781:793:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):392 -> a
+    794:802:com.android.tools.r8.shaking.VerticalClassMerger$AbortReason com.android.tools.r8.shaking.VerticalClassMerger.disallowInlining(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass):1705:1713 -> a
+    794:802:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):392 -> a
+    803:808:com.android.tools.r8.utils.TraversalContinuation lambda$isMergeCandidate$0(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.ProgramMethod):395:400 -> a
     1:1:com.android.tools.r8.graph.SubtypingInfo access$100(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> b
     2:6:void initializePinnedTypes(java.lang.Iterable):277:281 -> b
-    7:7:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):306:306 -> b
+    7:7:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):306:306 -> b
     7:7:void initializePinnedTypes(java.lang.Iterable):281 -> b
     8:8:boolean com.android.tools.r8.graph.DexReference.isDexType():0:0 -> b
-    8:8:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):307 -> b
+    8:8:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):307 -> b
     8:8:void initializePinnedTypes(java.lang.Iterable):281 -> b
-    9:24:void extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):308:323 -> b
+    9:24:void com.android.tools.r8.shaking.VerticalClassMerger.extractPinnedItems(java.lang.Iterable,com.android.tools.r8.shaking.VerticalClassMerger$AbortReason):308:323 -> b
     9:24:void initializePinnedTypes(java.lang.Iterable):281 -> b
     25:43:void initializePinnedTypes(java.lang.Iterable):283:301 -> b
-    44:44:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):489:489 -> b
-    45:45:boolean com.android.tools.r8.graph.DexClass.isPrivate():560:560 -> b
-    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
-    46:46:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> b
-    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):493 -> b
-    47:47:boolean com.android.tools.r8.graph.DexClass.isPrivate():560:560 -> b
-    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494 -> b
-    48:48:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> b
-    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):494 -> b
-    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():564:564 -> b
-    49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):503 -> b
-    50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):506:506 -> b
-    51:51:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():187:187 -> b
-    51:51:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507 -> b
-    52:52:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():179:179 -> b
-    52:52:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):507 -> b
-    53:53:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):511:511 -> b
-    54:54:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
-    54:54:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):512 -> b
-    55:55:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():484:484 -> b
-    55:55:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):512 -> b
-    56:56:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
-    56:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):516 -> b
-    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):517:517 -> b
-    58:58:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> b
-    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):518 -> b
-    59:70:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):526:537 -> b
+    44:44:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):491:491 -> b
+    45:45:boolean com.android.tools.r8.graph.DexClass.isPrivate():578:578 -> b
+    45:45:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):495 -> b
+    46:46:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> b
+    46:46:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):495 -> b
+    47:47:boolean com.android.tools.r8.graph.DexClass.isPrivate():578:578 -> b
+    47:47:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):496 -> b
+    48:48:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> b
+    48:48:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):496 -> b
+    49:49:boolean com.android.tools.r8.graph.DexClass.isPublic():582:582 -> b
+    49:49:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):505 -> b
+    50:50:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):508:508 -> b
+    51:51:boolean com.android.tools.r8.graph.DexEncodedField.isPublic():188:188 -> b
+    51:51:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):509 -> b
+    52:52:boolean com.android.tools.r8.graph.DexEncodedField.isPrivate():180:180 -> b
+    52:52:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):509 -> b
+    53:53:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):513:513 -> b
+    54:54:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> b
+    54:54:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):514 -> b
+    55:55:boolean com.android.tools.r8.graph.DexEncodedMethod.isPrivate():488:488 -> b
+    55:55:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):514 -> b
+    56:56:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> b
+    56:56:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):518 -> b
+    57:57:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):519:519 -> b
+    58:58:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> b
+    58:58:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):520 -> b
+    59:70:boolean mergeMayLeadToIllegalAccesses(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):528:539 -> b
     1:1:com.android.tools.r8.utils.Timing access$1000(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> c
-    2:63:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):726:787 -> c
+    2:63:boolean methodResolutionMayChange(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):728:789 -> c
     1:1:com.android.tools.r8.ir.optimize.MethodPoolCollection access$1100(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> d
     1:1:com.android.tools.r8.ir.optimize.info.OptimizationFeedback access$1300(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> e
     1:1:java.util.Map access$1400(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> f
@@ -75648,15 +76182,15 @@
     1:1:com.android.tools.r8.graph.DexApplication access$1600(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> h
     1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder access$1700(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> i
     1:1:java.util.List access$1800(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> j
-    1:246:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses getMergedClasses():0:245 -> k
+    1:246:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses com.android.tools.r8.shaking.VerticalClassMerger.getMergedClasses():0:245 -> k
     1:246:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses access$1900(com.android.tools.r8.shaking.VerticalClassMerger):96 -> k
     1:1:com.android.tools.r8.shaking.AppInfoWithLiveness access$200(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> l
-    1:4:java.util.Collection getInvokes():541:544 -> m
+    1:4:java.util.Collection com.android.tools.r8.shaking.VerticalClassMerger.getInvokes():543:546 -> m
     1:4:java.util.Collection access$2000(com.android.tools.r8.shaking.VerticalClassMerger):96 -> m
     1:1:com.android.tools.r8.graph.AppView access$300(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> n
     1:1:java.util.concurrent.ExecutorService access$900(com.android.tools.r8.shaking.VerticalClassMerger):96:96 -> o
-com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.shaking.L1:
-com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.shaking.M1:
+com.android.tools.r8.shaking.VerticalClassMerger$1 -> com.android.tools.r8.internal.jD:
+com.android.tools.r8.shaking.VerticalClassMerger$AbortReason -> com.android.tools.r8.internal.kD:
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NO_SIDE_EFFECTS -> h
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason NATIVE_METHOD -> g
     com.android.tools.r8.shaking.VerticalClassMerger$AbortReason MERGE_ACROSS_NESTS -> f
@@ -75680,12 +76214,12 @@
     1:20:void <clinit>():98:98 -> <clinit>
     1:1:void <init>(java.lang.String,int):98:98 -> <init>
     1:1:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):119:119 -> a
-    2:60:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):124:182 -> a
+    2:60:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):124:182 -> a
     2:60:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):119 -> a
     61:61:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):119:119 -> a
-    62:62:java.lang.String getMessageForClass(com.android.tools.r8.graph.DexClass):180:180 -> a
+    62:62:java.lang.String com.android.tools.r8.shaking.VerticalClassMerger$AbortReason.getMessageForClass(com.android.tools.r8.graph.DexClass):180:180 -> a
     62:62:void printLogMessageForClass(com.android.tools.r8.graph.DexClass):119 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.shaking.N1:
+com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger -> com.android.tools.r8.internal.lD:
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder deferredRenamings -> d
     java.util.List synthesizedBridges -> e
     com.android.tools.r8.graph.DexProgramClass source -> b
@@ -75693,111 +76227,111 @@
     boolean abortMerge -> f
     boolean $assertionsDisabled -> a
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> g
-    1:1:void <clinit>():901:901 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):901:901 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):913:913 -> <init>
-    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):907:915 -> <init>
-    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):930:933 -> a
-    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1012:1014 -> a
-    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1013:1013 -> a
-    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1073:1073 -> a
-    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1117:1117 -> a
-    11:23:boolean restoreDebuggingState(java.util.stream.Stream):1123:1135 -> a
-    24:24:boolean restoreDebuggingState(java.util.stream.Stream):1134:1134 -> a
-    25:26:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1125:1126 -> a
-    27:27:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1140:1140 -> a
-    28:92:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1148:1212 -> a
-    93:93:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1158:1158 -> a
-    94:97:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1334:1337 -> a
-    98:113:com.android.tools.r8.graph.DexEncodedField renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1435:1450 -> a
-    98:113:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1338 -> a
-    114:115:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1339:1340 -> a
+    1:1:void <clinit>():903:903 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.VerticalClassMerger$1):903:903 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):915:915 -> <init>
+    3:11:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):909:917 -> <init>
+    1:4:boolean lambda$merge$0(java.util.Set,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexMethod):932:935 -> a
+    5:7:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1014:1016 -> a
+    8:8:boolean lambda$merge$1(java.util.function.Predicate,com.android.tools.r8.ir.optimize.MemberPoolCollection$MemberPool,com.android.tools.r8.graph.DexMethod):1015:1015 -> a
+    9:9:boolean lambda$merge$2(java.util.Set,com.android.tools.r8.graph.DexField):1075:1075 -> a
+    10:10:java.util.Set lambda$merge$3(com.android.tools.r8.graph.DexType):1119:1119 -> a
+    11:23:boolean restoreDebuggingState(java.util.stream.Stream):1125:1137 -> a
+    24:24:boolean restoreDebuggingState(java.util.stream.Stream):1136:1136 -> a
+    25:26:void lambda$restoreDebuggingState$4(com.android.tools.r8.graph.DexEncodedMethod):1127:1128 -> a
+    27:27:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder getRenamings():1142:1142 -> a
+    28:92:void redirectSuperCallsInTarget(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):1150:1214 -> a
+    93:93:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$7(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1160:1160 -> a
+    94:97:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1336:1339 -> a
+    98:113:com.android.tools.r8.graph.DexEncodedField com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameFieldIfNeeded(com.android.tools.r8.graph.DexEncodedField,java.util.function.Predicate):1437:1452 -> a
+    98:113:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1340 -> a
+    114:115:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1341:1342 -> a
     116:116:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):325:325 -> a
-    116:116:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1340 -> a
-    117:122:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1341:1346 -> a
-    123:127:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1355:1359 -> a
-    128:128:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1389:1389 -> a
-    129:157:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1399:1427 -> a
-    158:182:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1406:1430 -> a
-    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1130:1131 -> b
-    3:3:java.util.List getSynthesizedBridges():1144:1144 -> b
-    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1180:1180 -> b
-    1:2:boolean merge():922:923 -> c
-    3:4:void addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1317:1318 -> c
-    3:4:boolean merge():923 -> c
-    5:17:boolean merge():925:937 -> c
-    18:32:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1364:1378 -> c
-    18:32:boolean merge():939 -> c
+    116:116:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1342 -> a
+    117:122:com.android.tools.r8.graph.DexEncodedField[] mergeFields(java.util.Collection,java.util.Collection,java.util.function.Predicate,java.util.Set):1343:1348 -> a
+    123:127:com.android.tools.r8.graph.DexString getFreshName(java.lang.String,int,com.android.tools.r8.graph.DexType):1357:1361 -> a
+    128:128:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename):1391:1391 -> a
+    129:157:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1401:1429 -> a
+    158:182:com.android.tools.r8.graph.DexEncodedMethod renameMethod(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate,com.android.tools.r8.shaking.VerticalClassMerger$Rename,com.android.tools.r8.graph.DexProto):1408:1432 -> a
+    1:2:void lambda$restoreDebuggingState$5(com.android.tools.r8.graph.DexEncodedMethod):1132:1133 -> b
+    3:3:java.util.List getSynthesizedBridges():1146:1146 -> b
+    4:4:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$8(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1182:1182 -> b
+    1:2:boolean merge():924:925 -> c
+    3:4:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.addAll(java.util.Collection,java.lang.Iterable,com.android.tools.r8.com.google.common.base.Equivalence):1319:1320 -> c
+    3:4:boolean merge():925 -> c
+    5:17:boolean merge():927:939 -> c
+    18:32:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1366:1380 -> c
+    18:32:boolean merge():941 -> c
     33:33:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> c
-    33:33:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1378 -> c
-    33:33:boolean merge():939 -> c
-    34:38:com.android.tools.r8.graph.DexEncodedMethod renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1379:1383 -> c
-    34:38:boolean merge():939 -> c
-    39:39:boolean merge():940:940 -> c
-    40:40:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
-    40:40:boolean merge():940 -> c
-    41:41:boolean merge():941:941 -> c
-    42:42:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    42:42:boolean merge():941 -> c
-    43:43:boolean merge():947:947 -> c
-    44:48:boolean merge():944:948 -> c
-    49:49:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
-    49:49:boolean merge():948 -> c
-    50:50:boolean merge():949:949 -> c
+    33:33:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1380 -> c
+    33:33:boolean merge():941 -> c
+    34:38:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.renameConstructor(com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Predicate):1381:1385 -> c
+    34:38:boolean merge():941 -> c
+    39:39:boolean merge():942:942 -> c
+    40:40:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1314:1314 -> c
+    40:40:boolean merge():942 -> c
+    41:41:boolean merge():943:943 -> c
+    42:42:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1237:1237 -> c
+    42:42:boolean merge():943 -> c
+    43:43:boolean merge():949:949 -> c
+    44:48:boolean merge():946:950 -> c
+    49:49:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1314:1314 -> c
+    49:49:boolean merge():950 -> c
+    50:50:boolean merge():951:951 -> c
     51:51:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> c
-    51:51:boolean merge():949 -> c
-    52:53:boolean merge():950:951 -> c
-    54:54:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    54:54:boolean merge():951 -> c
-    55:55:boolean merge():955:955 -> c
-    56:76:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1283:1303 -> c
-    56:76:boolean merge():956 -> c
-    77:77:com.android.tools.r8.graph.DexEncodedMethod findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1298:1298 -> c
-    77:77:boolean merge():956 -> c
-    78:80:boolean merge():958:960 -> c
+    51:51:boolean merge():951 -> c
+    52:53:boolean merge():952:953 -> c
+    54:54:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1237:1237 -> c
+    54:54:boolean merge():953 -> c
+    55:55:boolean merge():957:957 -> c
+    56:76:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1285:1305 -> c
+    56:76:boolean merge():958 -> c
+    77:77:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.findMethodInTarget(com.android.tools.r8.graph.DexEncodedMethod):1300:1300 -> c
+    77:77:boolean merge():958 -> c
+    78:80:boolean merge():960:962 -> c
     81:81:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> c
-    81:81:boolean merge():960 -> c
-    82:91:boolean merge():964:973 -> c
-    92:111:boolean merge():972:991 -> c
-    112:114:boolean merge():990:992 -> c
+    81:81:boolean merge():962 -> c
+    82:91:boolean merge():966:975 -> c
+    92:111:boolean merge():974:993 -> c
+    112:114:boolean merge():992:994 -> c
     115:115:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> c
-    115:115:boolean merge():992 -> c
-    116:117:boolean merge():993:994 -> c
-    118:118:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
-    118:118:boolean merge():994 -> c
-    119:135:boolean merge():1000:1016 -> c
-    136:136:boolean merge():1009:1009 -> c
-    137:141:void makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1454:1458 -> c
-    137:141:boolean merge():1017 -> c
-    142:152:boolean merge():1020:1030 -> c
-    153:153:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
-    153:153:boolean merge():1030 -> c
-    154:155:boolean merge():1034:1035 -> c
-    156:156:void blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1235:1235 -> c
-    156:156:boolean merge():1035 -> c
-    157:188:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1240:1271 -> c
-    157:188:boolean merge():1043 -> c
+    115:115:boolean merge():994 -> c
+    116:117:boolean merge():995:996 -> c
+    118:118:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1314:1314 -> c
+    118:118:boolean merge():996 -> c
+    119:135:boolean merge():1002:1018 -> c
+    136:136:boolean merge():1011:1011 -> c
+    137:141:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.makeStatic(com.android.tools.r8.graph.DexEncodedMethod):1456:1460 -> c
+    137:141:boolean merge():1019 -> c
+    142:152:boolean merge():1022:1032 -> c
+    153:153:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1314:1314 -> c
+    153:153:boolean merge():1032 -> c
+    154:155:boolean merge():1036:1037 -> c
+    156:156:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.blockRedirectionOfSuperCalls(com.android.tools.r8.graph.DexMethod):1237:1237 -> c
+    156:156:boolean merge():1037 -> c
+    157:188:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1242:1273 -> c
+    157:188:boolean merge():1045 -> c
     189:189:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean,com.android.tools.r8.cf.CfVersion):281:281 -> c
-    189:189:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1271 -> c
-    189:189:boolean merge():1043 -> c
-    190:194:com.android.tools.r8.graph.DexEncodedMethod buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1272:1276 -> c
-    190:194:boolean merge():1043 -> c
-    195:196:boolean merge():1044:1045 -> c
-    197:197:void add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1312:1312 -> c
-    197:197:boolean merge():1045 -> c
-    198:198:boolean merge():1048:1048 -> c
+    189:189:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1273 -> c
+    189:189:boolean merge():1045 -> c
+    190:194:com.android.tools.r8.graph.DexEncodedMethod com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.buildBridgeMethod(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1274:1278 -> c
+    190:194:boolean merge():1045 -> c
+    195:196:boolean merge():1046:1047 -> c
+    197:197:void com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.add(java.util.Map,com.android.tools.r8.graph.DexEncodedMember,com.android.tools.r8.com.google.common.base.Equivalence):1314:1314 -> c
+    197:197:boolean merge():1047 -> c
+    198:198:boolean merge():1050:1050 -> c
     199:199:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> c
-    199:199:boolean merge():1048 -> c
-    200:205:boolean merge():1049:1054 -> c
-    206:231:boolean merge():1053:1078 -> c
-    232:241:boolean merge():1076:1085 -> c
-    242:249:boolean merge():1083:1090 -> c
-    250:252:java.util.Set mergeArrays(java.lang.Object[],java.lang.Object[]):1323:1325 -> c
-    250:252:boolean merge():1090 -> c
-    253:278:boolean merge():1093:1118 -> c
-    279:279:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1135:1135 -> c
-    280:280:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1205:1205 -> c
-com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.shaking.O1:
+    199:199:boolean merge():1050 -> c
+    200:205:boolean merge():1051:1056 -> c
+    206:231:boolean merge():1055:1080 -> c
+    232:241:boolean merge():1078:1087 -> c
+    242:249:boolean merge():1085:1092 -> c
+    250:252:java.util.Set com.android.tools.r8.shaking.VerticalClassMerger$ClassMerger.mergeArrays(java.lang.Object[],java.lang.Object[]):1325:1327 -> c
+    250:252:boolean merge():1092 -> c
+    253:278:boolean merge():1095:1120 -> c
+    279:279:boolean lambda$restoreDebuggingState$6(com.android.tools.r8.graph.DexEncodedMethod):1137:1137 -> c
+    280:280:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$redirectSuperCallsInTarget$9(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.RewrittenPrototypeDescription):1207:1207 -> c
+com.android.tools.r8.shaking.VerticalClassMerger$CollisionDetector -> com.android.tools.r8.internal.mD:
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap targetProtoCache -> c
     java.util.Map seenPositions -> b
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap sourceProtoCache -> d
@@ -75806,58 +76340,58 @@
     com.android.tools.r8.graph.DexType target -> f
     java.util.Collection invokes -> g
     com.android.tools.r8.graph.DexType source -> e
-    1:1:void <clinit>():1576:1576 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1576:1576 -> <init>
-    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1587:1587 -> <init>
-    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1581:1593 -> <init>
-    1:18:void fillSeenPositions():1623:1640 -> a
-    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1630:1631 -> a
-    21:52:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1650:1681 -> a
-    1:22:boolean mayCollide():1597:1618 -> b
-com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.HC:
+    1:1:void <clinit>():1578:1578 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.VerticalClassMerger$1):1578:1578 -> <init>
+    2:2:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1589:1589 -> <init>
+    3:15:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):1583:1595 -> <init>
+    1:18:void fillSeenPositions():1625:1642 -> a
+    19:20:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntMap lambda$fillSeenPositions$0(com.android.tools.r8.graph.DexString):1632:1633 -> a
+    21:52:int computePositionsFor(com.android.tools.r8.graph.DexProto,com.android.tools.r8.graph.DexType,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2IntMap):1652:1683 -> a
+    1:22:boolean mayCollide():1599:1620 -> b
+com.android.tools.r8.shaking.VerticalClassMerger$IllegalAccessDetector -> com.android.tools.r8.internal.nD:
     com.android.tools.r8.graph.ProgramMethod context -> e
     com.android.tools.r8.graph.AppView appView -> f
     com.android.tools.r8.graph.DexClass source -> g
     boolean $assertionsDisabled -> c
     boolean foundIllegalAccess -> d
-    1:1:void <clinit>():1824:1824 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1833:1835 -> <init>
-    1:1:boolean foundIllegalAccess():1839:1839 -> a
-    2:2:void setContext(com.android.tools.r8.graph.ProgramMethod):1843:1843 -> a
-    3:17:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1863:1877 -> a
-    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
-    18:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1877 -> a
-    19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1878:1878 -> a
-    20:23:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1912:1915 -> a
-    24:24:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1949:1949 -> a
-    1:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1928:1931 -> b
-    1:4:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1920:1923 -> c
-    5:5:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1944:1944 -> c
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):1899:1899 -> d
-    2:5:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1936:1939 -> d
-    1:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1904:1907 -> e
-    5:5:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):1959:1959 -> e
-    6:6:void registerInstanceOf(com.android.tools.r8.graph.DexType):1974:1974 -> e
-    1:1:void registerNewInstance(com.android.tools.r8.graph.DexType):1954:1954 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1964:1964 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):1969:1969 -> g
-    1:5:void checkTypeReference(com.android.tools.r8.graph.DexType):1885:1889 -> h
-    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> h
-    6:6:void checkTypeReference(com.android.tools.r8.graph.DexType):1889 -> h
-    7:8:void checkTypeReference(com.android.tools.r8.graph.DexType):1890:1891 -> h
-    1:10:void checkFieldReference(com.android.tools.r8.graph.DexField):1847:1856 -> i
-com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.shaking.P1:
+    1:1:void <clinit>():1826:1826 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexClass):1835:1837 -> <init>
+    1:1:boolean foundIllegalAccess():1841:1841 -> a
+    2:2:void setContext(com.android.tools.r8.graph.ProgramMethod):1845:1845 -> a
+    3:17:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1865:1879 -> a
+    18:18:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> a
+    18:18:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1879 -> a
+    19:19:void checkMethodReference(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.OptionalBool):1880:1880 -> a
+    20:23:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):1914:1917 -> a
+    24:24:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):1951:1951 -> a
+    1:4:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):1930:1933 -> b
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):1901:1901 -> c
+    2:5:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):1922:1925 -> c
+    6:6:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):1946:1946 -> c
+    1:4:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):1938:1941 -> d
+    5:5:void registerInstanceOf(com.android.tools.r8.graph.DexType):1976:1976 -> d
+    1:4:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):1906:1909 -> e
+    5:5:void registerNewInstance(com.android.tools.r8.graph.DexType):1956:1956 -> e
+    6:6:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):1961:1961 -> e
+    1:1:void registerTypeReference(com.android.tools.r8.graph.DexType):1971:1971 -> f
+    1:5:void checkTypeReference(com.android.tools.r8.graph.DexType):1887:1891 -> g
+    6:6:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> g
+    6:6:void checkTypeReference(com.android.tools.r8.graph.DexType):1891 -> g
+    7:8:void checkTypeReference(com.android.tools.r8.graph.DexType):1892:1893 -> g
+    9:9:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):1966:1966 -> g
+    1:10:void checkFieldReference(com.android.tools.r8.graph.DexField):1849:1858 -> i
+com.android.tools.r8.shaking.VerticalClassMerger$OverloadedMethodSignaturesRetriever -> com.android.tools.r8.internal.oD:
     com.android.tools.r8.com.google.common.base.Equivalence equivalence -> b
     java.util.Set mergeeCandidates -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     com.android.tools.r8.it.unimi.dsi.fastutil.objects.Reference2BooleanOpenHashMap cache -> a
-    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):555:555 -> <init>
-    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):550:558 -> <init>
-    1:35:java.util.Collection get():563:597 -> a
-    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):581:581 -> a
-    37:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):605:619 -> a
-    52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):625:632 -> a
-com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.shaking.Q1:
+    1:1:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):557:557 -> <init>
+    2:10:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):552:560 -> <init>
+    1:35:java.util.Collection get():565:599 -> a
+    36:36:com.android.tools.r8.graph.DexProto lambda$get$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexString):583:583 -> a
+    37:51:boolean protoMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexProto):607:621 -> a
+    52:59:boolean typeMayReferenceMergedSourceOrTarget(com.android.tools.r8.graph.DexType):627:634 -> a
+com.android.tools.r8.shaking.VerticalClassMerger$Rename -> com.android.tools.r8.internal.pD:
     com.android.tools.r8.shaking.VerticalClassMerger$Rename[] $VALUES -> d
     com.android.tools.r8.shaking.VerticalClassMerger$Rename IF_NEEDED -> b
     com.android.tools.r8.shaking.VerticalClassMerger$Rename ALWAYS -> a
@@ -75865,94 +76399,94 @@
     1:3:void <clinit>():187:189 -> <clinit>
     4:4:void <clinit>():186:186 -> <clinit>
     1:1:void <init>(java.lang.String,int):186:186 -> <init>
-com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.shaking.R1:
+com.android.tools.r8.shaking.VerticalClassMerger$SingleTypeMapperGraphLens -> com.android.tools.r8.internal.qD:
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> i
     boolean $assertionsDisabled -> f
     com.android.tools.r8.graph.DexProgramClass target -> h
     com.android.tools.r8.graph.DexType source -> g
-    1:1:void <clinit>():1714:1714 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1719:1722 -> <init>
-    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1727:1727 -> a
-    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1737:1737 -> a
-    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1742:1742 -> a
-    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1752:1752 -> a
-    5:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1769:1789 -> a
-    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1796:1796 -> a
-    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1732:1732 -> b
-    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1747:1747 -> b
-    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1813:1813 -> b
-    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1807:1807 -> c
-    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1802:1802 -> d
+    1:1:void <clinit>():1716:1716 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass):1721:1724 -> <init>
+    1:1:com.android.tools.r8.graph.DexType getOriginalType(com.android.tools.r8.graph.DexType):1729:1729 -> a
+    2:2:com.android.tools.r8.graph.DexField getOriginalFieldSignature(com.android.tools.r8.graph.DexField):1739:1739 -> a
+    3:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):1744:1744 -> a
+    4:4:com.android.tools.r8.graph.DexMethod getRenamedMethodSignature(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens):1754:1754 -> a
+    5:25:com.android.tools.r8.graph.GraphLens$MethodLookupResult lookupMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):1771:1791 -> a
+    26:26:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):1798:1798 -> a
+    1:1:java.lang.Iterable getOriginalTypes(com.android.tools.r8.graph.DexType):1734:1734 -> b
+    2:2:com.android.tools.r8.graph.DexField getRenamedFieldSignature(com.android.tools.r8.graph.DexField):1749:1749 -> b
+    3:3:com.android.tools.r8.graph.GraphLens$FieldLookupResult internalDescribeLookupField(com.android.tools.r8.graph.GraphLens$FieldLookupResult):1815:1815 -> b
+    1:1:com.android.tools.r8.graph.DexField lookupField(com.android.tools.r8.graph.DexField):1809:1809 -> c
+    1:1:com.android.tools.r8.graph.RewrittenPrototypeDescription lookupPrototypeChangesForMethodDefinition(com.android.tools.r8.graph.DexMethod):1804:1804 -> d
     boolean isContextFreeForMethods() -> e
-    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1757:1757 -> e
-    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1762:1762 -> f
-com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.shaking.S1:
+    1:1:com.android.tools.r8.graph.DexType internalDescribeLookupClassType(com.android.tools.r8.graph.DexType):1759:1759 -> e
+    1:1:com.android.tools.r8.graph.DexMethod internalGetPreviousMethodSignature(com.android.tools.r8.graph.DexMethod):1764:1764 -> f
+com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode -> com.android.tools.r8.internal.rD:
     com.android.tools.r8.ir.code.Invoke$Type type -> f
     com.android.tools.r8.graph.DexMethod invocationTarget -> e
     boolean isInterface -> g
     com.android.tools.r8.graph.DexMethod originalMethod -> d
     com.android.tools.r8.graph.DexMethod method -> c
-    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1991:1996 -> <init>
-    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2017:2017 -> A
+    1:6:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type,boolean):1993:1998 -> <init>
+    1:1:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2019:2019 -> A
     2:26:com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode$Builder com.android.tools.r8.ir.synthetic.ForwardMethodSourceCode.builder(com.android.tools.r8.graph.DexMethod):0:24 -> A
-    2:26:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2018 -> A
-    27:34:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2019:2026 -> A
-    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1978:1978 -> a
-    2:3:void updateMethodSignatures(java.util.function.Function):2011:2012 -> a
-    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2032:2042 -> a
-    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2034:2034 -> a
-    1:1:java.util.function.Consumer getRegistryCallback():2031:2031 -> z
-com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.shaking.T1:
+    2:26:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2020 -> A
+    27:34:com.android.tools.r8.ir.synthetic.AbstractSynthesizedCode$SourceCodeProvider getSourceCodeProvider():2021:2028 -> A
+    1:1:com.android.tools.r8.graph.DexMethod access$600(com.android.tools.r8.shaking.VerticalClassMerger$SynthesizedBridgeCode):1980:1980 -> a
+    2:3:void updateMethodSignatures(java.util.function.Function):2013:2014 -> a
+    4:14:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2034:2044 -> a
+    15:15:void lambda$getRegistryCallback$0(com.android.tools.r8.graph.UseRegistry):2036:2036 -> a
+    1:1:java.util.function.Consumer getRegistryCallback():2033:2033 -> z
+com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer -> com.android.tools.r8.internal.sD:
     java.util.Map protoFixupCache -> c
     com.android.tools.r8.shaking.VerticalClassMerger this$0 -> d
     boolean $assertionsDisabled -> a
     com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder lensBuilder -> b
-    1:1:void <clinit>():1470:1470 -> <clinit>
-    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1470:1474 -> <init>
-    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1473:1475 -> <init>
-    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1470:1470 -> <init>
-    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1470:1470 -> a
-    2:12:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1479:1489 -> a
-    13:13:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1495:1495 -> a
-    14:15:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1535:1536 -> a
-    14:15:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1496 -> a
-    16:19:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1540:1543 -> a
-    16:19:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536 -> a
-    16:19:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1496 -> a
-    20:22:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1568:1570 -> a
-    20:22:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1543 -> a
-    20:22:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536 -> a
-    20:22:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1496 -> a
-    23:24:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1544:1545 -> a
-    23:24:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536 -> a
-    23:24:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1496 -> a
-    25:25:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536:1536 -> a
-    25:25:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1496 -> a
-    26:26:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1535:1535 -> a
-    26:26:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1496 -> a
-    27:28:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1498:1499 -> a
+    1:1:void <clinit>():1472:1472 -> <clinit>
+    1:5:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1472:1476 -> <init>
+    6:8:void <init>(com.android.tools.r8.shaking.VerticalClassMerger):1475:1477 -> <init>
+    9:9:void <init>(com.android.tools.r8.shaking.VerticalClassMerger,com.android.tools.r8.shaking.VerticalClassMerger$1):1472:1472 -> <init>
+    1:1:com.android.tools.r8.shaking.VerticalClassMergerGraphLens access$500(com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer):1472:1472 -> a
+    2:12:com.android.tools.r8.shaking.VerticalClassMergerGraphLens fixupTypeReferences():1481:1491 -> a
+    13:13:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1497:1497 -> a
+    14:15:com.android.tools.r8.graph.DexMethod com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupMethod(com.android.tools.r8.graph.DexMethod):1537:1538 -> a
+    14:15:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1498 -> a
+    16:19:com.android.tools.r8.graph.DexProto com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):1542:1545 -> a
+    16:19:com.android.tools.r8.graph.DexMethod com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupMethod(com.android.tools.r8.graph.DexMethod):1538 -> a
+    16:19:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1498 -> a
+    20:22:com.android.tools.r8.graph.DexType[] com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):1570:1572 -> a
+    20:22:com.android.tools.r8.graph.DexProto com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):1545 -> a
+    20:22:com.android.tools.r8.graph.DexMethod com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupMethod(com.android.tools.r8.graph.DexMethod):1538 -> a
+    20:22:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1498 -> a
+    23:24:com.android.tools.r8.graph.DexProto com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):1546:1547 -> a
+    23:24:com.android.tools.r8.graph.DexMethod com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupMethod(com.android.tools.r8.graph.DexMethod):1538 -> a
+    23:24:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1498 -> a
+    25:25:com.android.tools.r8.graph.DexMethod com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupMethod(com.android.tools.r8.graph.DexMethod):1538:1538 -> a
+    25:25:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1498 -> a
+    26:26:com.android.tools.r8.graph.DexMethod com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupMethod(com.android.tools.r8.graph.DexMethod):1537:1537 -> a
+    26:26:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1498 -> a
+    27:28:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1500:1501 -> a
     29:29:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> a
-    29:29:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1500 -> a
-    30:37:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1501:1508 -> a
-    38:45:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1519:1526 -> a
+    29:29:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1502 -> a
+    30:37:com.android.tools.r8.graph.DexEncodedMethod fixupMethod(com.android.tools.r8.graph.DexEncodedMethod):1503:1510 -> a
+    38:45:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1521:1528 -> a
     46:46:boolean com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.hasOriginalSignatureMappingFor(com.android.tools.r8.graph.DexField):312:312 -> a
-    46:46:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1526 -> a
-    47:47:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1527:1527 -> a
+    46:46:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1528 -> a
+    47:47:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1529:1529 -> a
     48:48:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):325:325 -> a
-    48:48:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1527 -> a
-    49:49:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1529:1529 -> a
-    50:51:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1535:1536 -> a
-    52:55:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1540:1543 -> a
-    52:55:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536 -> a
-    56:58:com.android.tools.r8.graph.DexType[] fixupTypes(com.android.tools.r8.graph.DexType[]):1568:1570 -> a
-    56:58:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1543 -> a
-    56:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536 -> a
-    59:60:com.android.tools.r8.graph.DexProto fixupProto(com.android.tools.r8.graph.DexProto):1544:1545 -> a
-    59:60:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536 -> a
-    61:61:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1536:1536 -> a
-    62:62:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1535:1535 -> a
-    63:73:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1551:1561 -> a
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.shaking.Y1:
+    48:48:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1529 -> a
+    49:49:void fixupFields(java.util.List,com.android.tools.r8.graph.DexClass$FieldSetter):1531:1531 -> a
+    50:51:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1537:1538 -> a
+    52:55:com.android.tools.r8.graph.DexProto com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):1542:1545 -> a
+    52:55:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1538 -> a
+    56:58:com.android.tools.r8.graph.DexType[] com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupTypes(com.android.tools.r8.graph.DexType[]):1570:1572 -> a
+    56:58:com.android.tools.r8.graph.DexProto com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):1545 -> a
+    56:58:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1538 -> a
+    59:60:com.android.tools.r8.graph.DexProto com.android.tools.r8.shaking.VerticalClassMerger$TreeFixer.fixupProto(com.android.tools.r8.graph.DexProto):1546:1547 -> a
+    59:60:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1538 -> a
+    61:61:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1538:1538 -> a
+    62:62:com.android.tools.r8.graph.DexMethod fixupMethod(com.android.tools.r8.graph.DexMethod):1537:1537 -> a
+    63:73:com.android.tools.r8.graph.DexType fixupType(com.android.tools.r8.graph.DexType):1553:1563 -> a
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens -> com.android.tools.r8.internal.xD:
     boolean $assertionsDisabled -> m
     com.android.tools.r8.graph.AppView appView -> n
     java.util.Map originalMethodSignaturesForBridges -> r
@@ -75966,7 +76500,7 @@
     1:3:com.android.tools.r8.graph.DexMethod getOriginalMethodSignature(com.android.tools.r8.graph.DexMethod):111:111 -> a
     4:30:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):118:144 -> a
     31:33:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):143:145 -> a
-    34:34:com.android.tools.r8.ir.code.Invoke$Type mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):151:151 -> a
+    34:34:com.android.tools.r8.ir.code.Invoke$Type com.android.tools.r8.shaking.VerticalClassMergerGraphLens.mapInvocationType(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.ir.code.Invoke$Type):151:151 -> a
     34:34:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):145 -> a
     35:36:com.android.tools.r8.graph.GraphLens$MethodLookupResult internalDescribeLookupMethod(com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.DexMethod):145:146 -> a
     37:37:boolean lambda$verifyIsContextFreeForMethod$0(com.android.tools.r8.graph.DexMethod,java.util.Map):164:164 -> a
@@ -75978,8 +76512,8 @@
     3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):433:433 -> g
     3:3:java.lang.Iterable internalGetOriginalTypes(com.android.tools.r8.graph.DexType):106 -> g
     1:1:com.android.tools.r8.graph.classmerging.VerticallyMergedClasses getMergedClasses():96:96 -> l
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.shaking.V1:
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.shaking.W1:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$1 -> com.android.tools.r8.internal.uD:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder -> com.android.tools.r8.internal.vD:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     java.util.Map methodMap -> d
     com.android.tools.r8.com.google.common.collect.BiMap fieldMap -> c
@@ -75993,21 +76527,21 @@
     1:1:void <init>(com.android.tools.r8.graph.DexItemFactory):184:184 -> <init>
     2:15:void <init>(com.android.tools.r8.graph.DexItemFactory):172:185 -> <init>
     1:5:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):189:193 -> a
-    6:17:com.android.tools.r8.graph.DexField getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,java.util.Map):258:269 -> a
+    6:17:com.android.tools.r8.graph.DexField com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.getFieldSignatureAfterClassMerging(com.android.tools.r8.graph.DexField,java.util.Map):258:269 -> a
     6:17:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):193 -> a
-    18:18:void map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):325:325 -> a
+    18:18:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexField):325:325 -> a
     18:18:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):191 -> a
     19:22:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):195:198 -> a
-    23:23:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> a
+    23:23:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.map(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):329:329 -> a
     23:23:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):196 -> a
     24:26:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):200:202 -> a
-    27:27:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):321:321 -> a
+    27:27:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.markMethodAsMerged(com.android.tools.r8.graph.DexMethod):321:321 -> a
     27:27:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):201 -> a
     28:48:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):205:225 -> a
-    49:49:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):334:334 -> a
+    49:49:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):334:334 -> a
     49:49:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):223 -> a
     50:53:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):228:231 -> a
-    54:54:void recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):338:338 -> a
+    54:54:void com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder.recordCreationOfBridgeMethod(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):338:338 -> a
     54:54:com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder createBuilderForFixup(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder,java.util.Map):229 -> a
     55:55:com.android.tools.r8.graph.GraphLens$MethodLookupResult lambda$createBuilderForFixup$0(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.graph.RewrittenPrototypeDescription):218:218 -> a
     56:71:com.android.tools.r8.shaking.VerticalClassMergerGraphLens build(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.classmerging.VerticallyMergedClasses):238:253 -> a
@@ -76022,9 +76556,9 @@
     107:120:void merge(com.android.tools.r8.shaking.VerticalClassMergerGraphLens$Builder):349:362 -> a
     1:1:void markMethodAsMerged(com.android.tools.r8.graph.DexMethod):321:321 -> b
     2:2:void recordMove(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):334:334 -> b
-com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.shaking.X1:
+com.android.tools.r8.shaking.VerticalClassMergerGraphLens$GraphLensLookupResultProvider -> com.android.tools.r8.internal.wD:
     com.android.tools.r8.graph.GraphLens$MethodLookupResult get(com.android.tools.r8.graph.RewrittenPrototypeDescription) -> a
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.QC:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer -> com.android.tools.r8.internal.GD:
     boolean $assertionsDisabled -> c
     1:1:void <clinit>():43:43 -> <clinit>
     1:1:void <init>(com.android.tools.r8.experimental.graphinfo.GraphConsumer):58:58 -> <init>
@@ -76061,7 +76595,7 @@
     34:38:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230 -> d
     39:45:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):230:236 -> d
     46:46:java.lang.String getNodeString(com.android.tools.r8.experimental.graphinfo.GraphNode):235:235 -> d
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.QC$a:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$Formatter -> com.android.tools.r8.internal.GD$a:
     java.io.PrintStream output -> a
     int indentation -> b
     1:1:void <init>(java.io.PrintStream):257:257 -> <init>
@@ -76071,23 +76605,23 @@
     1:2:void indent():268:269 -> b
     3:5:void addReason(java.lang.String):274:276 -> b
     1:3:void startItem(java.lang.String):262:264 -> c
-com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.QC$b:
+com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath -> com.android.tools.r8.internal.GD$b:
     com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath path -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.experimental.graphinfo.GraphNode node -> b
     1:1:void <clinit>():46:46 -> <clinit>
     1:4:void <init>(com.android.tools.r8.experimental.graphinfo.GraphNode,com.android.tools.r8.shaking.WhyAreYouKeepingConsumer$GraphPath):50:53 -> <init>
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.b2:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule -> com.android.tools.r8.shaking.L1:
     int $r8$clinit -> q
     1:1:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List,com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):10:10 -> <init>
     2:2:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,java.lang.String,java.util.List,com.android.tools.r8.shaking.ProguardAccessFlags,com.android.tools.r8.shaking.ProguardAccessFlags,boolean,com.android.tools.r8.shaking.ProguardClassType,com.android.tools.r8.shaking.ProguardClassNameList,java.util.List,com.android.tools.r8.shaking.ProguardTypeMatcher,boolean,java.util.List):57:57 -> <init>
     java.lang.String typeString() -> A
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.shaking.Z1:
-com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.a2:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1 -> com.android.tools.r8.shaking.J1:
+com.android.tools.r8.shaking.WhyAreYouNotInliningRule$Builder -> com.android.tools.r8.shaking.K1:
     1:1:void <init>(com.android.tools.r8.shaking.WhyAreYouNotInliningRule$1):12:12 -> <init>
     2:2:void <init>():16:16 -> <init>
     com.android.tools.r8.shaking.ProguardClassSpecification$Builder self() -> d
-com.android.tools.r8.synthesis.CommittedItems -> com.android.tools.r8.internal.O6:
+com.android.tools.r8.synthesis.CommittedItems -> com.android.tools.r8.internal.T6:
     com.android.tools.r8.graph.DexApplication application -> b
     com.android.tools.r8.com.google.common.collect.ImmutableMap syntheticItems -> e
     com.android.tools.r8.com.google.common.collect.ImmutableList committedTypes -> f
@@ -76101,28 +76635,28 @@
     3:4:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):70:71 -> a
     1:1:java.util.Collection getCommittedTypes():60:60 -> b
     1:1:com.android.tools.r8.synthesis.SyntheticItems toSyntheticItems():52:52 -> c
-com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.internal.Uz:
+com.android.tools.r8.synthesis.SynthesizingContext -> com.android.tools.r8.internal.nA:
     com.android.tools.r8.origin.Origin inputContextOrigin -> d
     com.android.tools.r8.graph.DexType inputContextType -> c
     com.android.tools.r8.graph.DexType synthesizingContextType -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():28:28 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):55:58 -> <init>
-    1:1:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass):43:43 -> a
-    2:5:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):48:51 -> a
-    6:12:int compareTo(com.android.tools.r8.synthesis.SynthesizingContext):63:69 -> a
-    13:13:com.android.tools.r8.origin.Origin getInputContextOrigin():73:73 -> a
-    14:17:com.android.tools.r8.graph.DexType createHygienicType(int,com.android.tools.r8.graph.DexItemFactory):78:81 -> a
-    18:23:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):85:90 -> a
-    24:25:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):99:100 -> a
-    26:26:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():397:397 -> a
-    26:26:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):100 -> a
-    27:44:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):105:122 -> a
-    45:48:void addIfDerivedFromMainDexClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set):133:136 -> a
-    1:1:com.android.tools.r8.graph.DexType lambda$compareTo$0(com.android.tools.r8.synthesis.SynthesizingContext):68:68 -> b
-    2:2:com.android.tools.r8.graph.DexType getSynthesizingContextType():95:95 -> b
-    1:1:int compareTo(java.lang.Object):28:28 -> compareTo
-com.android.tools.r8.synthesis.SyntheticClassBuilder -> com.android.tools.r8.internal.Zz:
+    1:1:void <clinit>():29:29 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin):57:60 -> <init>
+    1:2:com.android.tools.r8.synthesis.SynthesizingContext fromNonSyntheticInputContext(com.android.tools.r8.graph.ProgramDefinition):44:45 -> a
+    3:6:com.android.tools.r8.synthesis.SynthesizingContext fromSyntheticInputClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):50:53 -> a
+    7:13:int compareTo(com.android.tools.r8.synthesis.SynthesizingContext):65:71 -> a
+    14:14:com.android.tools.r8.origin.Origin getInputContextOrigin():75:75 -> a
+    15:18:com.android.tools.r8.graph.DexType createHygienicType(java.lang.String,com.android.tools.r8.graph.DexItemFactory):80:83 -> a
+    19:24:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):87:92 -> a
+    25:26:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):101:102 -> a
+    27:27:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():398:398 -> a
+    27:27:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):102 -> a
+    28:45:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):107:124 -> a
+    46:49:void addIfDerivedFromMainDexClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set):135:138 -> a
+    1:1:com.android.tools.r8.graph.DexType lambda$compareTo$0(com.android.tools.r8.synthesis.SynthesizingContext):70:70 -> b
+    2:2:com.android.tools.r8.graph.DexType getSynthesizingContextType():97:97 -> b
+    1:1:int compareTo(java.lang.Object):29:29 -> compareTo
+com.android.tools.r8.synthesis.SyntheticClassBuilder -> com.android.tools.r8.internal.sA:
     com.android.tools.r8.graph.DexItemFactory factory -> b
     com.android.tools.r8.graph.DexTypeList interfaces -> f
     com.android.tools.r8.origin.Origin origin -> d
@@ -76142,157 +76676,166 @@
     6:53:com.android.tools.r8.graph.DexProgramClass build():68:115 -> a
     1:1:com.android.tools.r8.graph.DexItemFactory getFactory():48:48 -> b
     1:1:com.android.tools.r8.graph.DexType getType():52:52 -> c
-com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.aA:
+com.android.tools.r8.synthesis.SyntheticDefinitionsProvider -> com.android.tools.r8.internal.tA:
     com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function) -> a
-com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.internal.cA:
+com.android.tools.r8.synthesis.SyntheticFinalization -> com.android.tools.r8.internal.vA:
     com.android.tools.r8.com.google.common.collect.ImmutableMap syntheticItems -> d
     com.android.tools.r8.utils.InternalOptions options -> b
     boolean $assertionsDisabled -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet legacySyntheticTypes -> c
-    1:1:void <clinit>():38:38 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):85:88 -> <init>
-    1:1:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):92:92 -> a
-    2:3:boolean com.android.tools.r8.synthesis.SyntheticFinalization.verifyNoNestedSynthetics():144:145 -> a
-    2:3:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):92 -> a
-    4:36:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):93:125 -> a
-    37:37:boolean com.android.tools.r8.synthesis.SyntheticFinalization.shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):334:334 -> a
-    37:37:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):156 -> a
-    37:37:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):125 -> a
-    38:40:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):158:160 -> a
-    38:40:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):125 -> a
-    41:43:void com.android.tools.r8.synthesis.SyntheticFinalization.clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):236:238 -> a
-    41:43:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):163 -> a
-    41:43:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):125 -> a
-    44:44:void com.android.tools.r8.synthesis.SyntheticFinalization.clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):237:237 -> a
-    44:44:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):163 -> a
-    44:44:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):125 -> a
-    45:56:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):128:139 -> a
-    57:82:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):170:195 -> a
-    83:90:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):194:201 -> a
-    91:91:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$0(com.android.tools.r8.graph.DexProgramClass):192:192 -> a
-    92:96:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):209:213 -> a
-    97:98:void com.android.tools.r8.shaking.MainDexClasses.addAll(java.lang.Iterable):47:48 -> a
-    97:98:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):232 -> a
-    99:109:void lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType):216:226 -> a
-    110:133:void buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.function.Predicate,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.GraphLens$Builder,java.util.List,java.util.List,java.util.Set):251:274 -> a
-    134:137:void lambda$buildLensAndProgram$2(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):264:267 -> a
-    138:142:void lambda$buildLensAndProgram$2(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):266:270 -> a
-    143:143:void lambda$buildLensAndProgram$2(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):269:269 -> a
-    144:159:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):276:291 -> a
-    160:160:boolean com.android.tools.r8.synthesis.SyntheticFinalization.shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):334:334 -> a
-    160:160:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):291 -> a
-    161:164:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):294:297 -> a
-    165:167:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createAnnotationSynthesizedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):386:388 -> a
-    165:167:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):296 -> a
-    168:168:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):295:295 -> a
-    169:197:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):292:320 -> a
-    198:198:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):319:319 -> a
-    199:205:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):316:322 -> a
-    206:210:void lambda$buildLensAndProgram$4(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):284:288 -> a
-    211:211:com.android.tools.r8.graph.Code lambda$buildLensAndProgram$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):288:288 -> a
-    212:230:java.util.Map computeActualEquivalences(java.util.Collection,com.android.tools.r8.graph.DexItemFactory):340:358 -> a
-    231:231:java.util.List lambda$computeActualEquivalences$6(com.android.tools.r8.graph.DexType):352:352 -> a
-    232:234:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):360:362 -> a
-    235:237:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):407:409 -> a
-    235:237:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):363 -> a
-    238:238:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):408:408 -> a
-    238:238:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):363 -> a
-    239:239:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):407:407 -> a
-    239:239:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):363 -> a
-    240:240:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):364:364 -> a
-    241:255:java.util.List com.android.tools.r8.synthesis.SyntheticFinalization.groupEquivalent(java.util.List):372:386 -> a
-    241:255:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):343 -> a
-    256:256:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):344:344 -> a
-    257:260:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticFinalization.findDeterministicRepresentative(java.util.List):395:398 -> a
-    257:260:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):345 -> a
-    261:265:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):347:351 -> a
-    266:269:void lambda$computeActualEquivalences$7(java.util.Map,java.util.List):350:353 -> a
-    270:275:java.util.Collection computePotentialEquivalences(java.util.List):416:421 -> a
-    276:276:java.util.List lambda$computePotentialEquivalences$9(com.android.tools.r8.com.google.common.hash.HashCode):419:419 -> a
-    277:279:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):426:428 -> a
-    280:286:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticMethodReference.lookupDefinition(java.util.function.Function):39:45 -> a
-    280:286:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):428 -> a
-    287:292:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):435:440 -> a
-    293:293:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):431:431 -> a
-com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.android.tools.r8.internal.bA:
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):84:87 -> <init>
+    1:1:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):91:91 -> a
+    2:3:boolean com.android.tools.r8.synthesis.SyntheticFinalization.verifyNoNestedSynthetics():140:141 -> a
+    2:3:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):91 -> a
+    4:33:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):92:121 -> a
+    34:34:boolean com.android.tools.r8.synthesis.SyntheticFinalization.shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):330:330 -> a
+    34:34:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):152 -> a
+    34:34:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):121 -> a
+    35:37:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):154:156 -> a
+    35:37:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):121 -> a
+    38:40:void com.android.tools.r8.synthesis.SyntheticFinalization.clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):232:234 -> a
+    38:40:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):159 -> a
+    38:40:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):121 -> a
+    41:41:void com.android.tools.r8.synthesis.SyntheticFinalization.clearSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication):233:233 -> a
+    41:41:void com.android.tools.r8.synthesis.SyntheticFinalization.handleSynthesizedClassMapping(java.util.List,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):159 -> a
+    41:41:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):121 -> a
+    42:53:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):124:135 -> a
+    54:79:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):166:191 -> a
+    80:87:void updateSynthesizedClassMapping(com.android.tools.r8.graph.DexApplication,java.util.List):190:197 -> a
+    88:88:com.android.tools.r8.graph.DexType lambda$updateSynthesizedClassMapping$0(com.android.tools.r8.graph.DexProgramClass):188:188 -> a
+    89:93:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):205:209 -> a
+    94:95:void com.android.tools.r8.shaking.MainDexClasses.addAll(java.lang.Iterable):47:48 -> a
+    94:95:void updateMainDexListWithSynthesizedClassMap(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.shaking.MainDexClasses,java.util.Set):228 -> a
+    96:106:void lambda$updateMainDexListWithSynthesizedClassMap$1(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.List,com.android.tools.r8.graph.DexType):212:222 -> a
+    107:130:void buildLensAndProgram(com.android.tools.r8.graph.AppView,java.util.Map,java.util.function.Predicate,com.android.tools.r8.shaking.MainDexClasses,com.android.tools.r8.graph.GraphLens$Builder,java.util.List,java.util.List,java.util.Set):247:270 -> a
+    131:134:void lambda$buildLensAndProgram$2(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):260:263 -> a
+    135:139:void lambda$buildLensAndProgram$2(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):262:266 -> a
+    140:140:void lambda$buildLensAndProgram$2(java.util.Set,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):265:265 -> a
+    141:156:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):272:287 -> a
+    157:157:boolean com.android.tools.r8.synthesis.SyntheticFinalization.shouldAnnotateSynthetics(com.android.tools.r8.utils.InternalOptions):330:330 -> a
+    157:157:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):287 -> a
+    158:161:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):290:293 -> a
+    162:164:com.android.tools.r8.graph.DexAnnotation com.android.tools.r8.graph.DexAnnotation.createAnnotationSynthesizedClass(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexItemFactory):386:388 -> a
+    162:164:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):292 -> a
+    165:165:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):291:291 -> a
+    166:194:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):288:316 -> a
+    195:195:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):315:315 -> a
+    196:202:void lambda$buildLensAndProgram$5(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexItemFactory,java.util.List,com.android.tools.r8.graph.GraphLens$Builder,com.android.tools.r8.shaking.MainDexClasses,java.util.Set,java.util.Set,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):312:318 -> a
+    203:207:void lambda$buildLensAndProgram$4(com.android.tools.r8.synthesis.SyntheticMethodDefinition,com.android.tools.r8.synthesis.SyntheticMethodBuilder):280:284 -> a
+    208:208:com.android.tools.r8.graph.Code lambda$buildLensAndProgram$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexMethod):284:284 -> a
+    209:227:java.util.Map computeActualEquivalences(java.util.Collection,boolean,com.android.tools.r8.graph.DexItemFactory):336:354 -> a
+    228:228:java.util.List lambda$computeActualEquivalences$6(com.android.tools.r8.graph.DexType):348:348 -> a
+    229:234:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):356:361 -> a
+    235:235:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):73:73 -> a
+    235:235:boolean com.android.tools.r8.synthesis.SyntheticFinalization.checkGroupsAreDistict(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):393 -> a
+    235:235:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):361 -> a
+    236:236:boolean com.android.tools.r8.synthesis.SyntheticFinalization.checkGroupsAreDistict(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup,com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):393:393 -> a
+    236:236:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):361 -> a
+    237:239:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):412:414 -> a
+    237:239:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):362 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):413:413 -> a
+    240:240:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):362 -> a
+    241:241:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticFinalization.createExternalType(com.android.tools.r8.graph.DexType,int,com.android.tools.r8.graph.DexItemFactory):412:412 -> a
+    241:241:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):362 -> a
+    242:242:void lambda$computeActualEquivalences$8(com.android.tools.r8.graph.DexItemFactory,java.util.Map,com.android.tools.r8.graph.DexType,java.util.List):363:363 -> a
+    243:257:java.util.List com.android.tools.r8.synthesis.SyntheticFinalization.groupEquivalent(java.util.List,boolean):371:385 -> a
+    243:257:void lambda$computeActualEquivalences$7(boolean,java.util.Map,java.util.List):339 -> a
+    258:258:void lambda$computeActualEquivalences$7(boolean,java.util.Map,java.util.List):340:340 -> a
+    259:262:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticFinalization.findDeterministicRepresentative(java.util.List):400:403 -> a
+    259:262:void lambda$computeActualEquivalences$7(boolean,java.util.Map,java.util.List):341 -> a
+    263:267:void lambda$computeActualEquivalences$7(boolean,java.util.Map,java.util.List):343:347 -> a
+    268:271:void lambda$computeActualEquivalences$7(boolean,java.util.Map,java.util.List):346:349 -> a
+    272:277:java.util.Collection computePotentialEquivalences(java.util.List,boolean):421:426 -> a
+    278:278:java.util.List lambda$computePotentialEquivalences$9(com.android.tools.r8.com.google.common.hash.HashCode):424:424 -> a
+    279:281:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):431:433 -> a
+    282:288:com.android.tools.r8.synthesis.SyntheticDefinition com.android.tools.r8.synthesis.SyntheticMethodReference.lookupDefinition(java.util.function.Function):39:45 -> a
+    282:288:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):433 -> a
+    289:294:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):440:445 -> a
+    295:295:java.util.List lookupSyntheticMethodDefinitions(com.android.tools.r8.graph.DexApplication):436:436 -> a
+com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup -> com.android.tools.r8.internal.uA:
     java.util.List members -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():50:50 -> <clinit>
-    1:4:void <init>(com.android.tools.r8.synthesis.SyntheticDefinition,java.util.List):58:61 -> <init>
-    1:1:java.util.List getMembers():69:69 -> a
-    2:2:int compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):74:74 -> a
-    1:1:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():65:65 -> b
-    1:1:int compareTo(java.lang.Object):50:50 -> compareTo
-    2:2:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):74:74 -> compareTo
-    2:2:int compareTo(java.lang.Object):50 -> compareTo
-com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.cA$a:
+    1:1:void <clinit>():49:49 -> <clinit>
+    1:4:void <init>(com.android.tools.r8.synthesis.SyntheticDefinition,java.util.List):57:60 -> <init>
+    1:1:java.util.List getMembers():68:68 -> a
+    2:2:int compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):73:73 -> a
+    1:1:com.android.tools.r8.synthesis.SyntheticDefinition getRepresentative():64:64 -> b
+    1:1:int compareTo(java.lang.Object):49:49 -> compareTo
+    2:2:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):73:73 -> compareTo
+    2:2:int compareTo(java.lang.Object):49 -> compareTo
+    3:22:int com.android.tools.r8.synthesis.SyntheticMethodDefinition.compareTo(java.lang.Object):0:19 -> compareTo
+    3:22:int com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup.compareTo(com.android.tools.r8.synthesis.SyntheticFinalization$EquivalenceGroup):73 -> compareTo
+    3:22:int compareTo(java.lang.Object):49 -> compareTo
+com.android.tools.r8.synthesis.SyntheticFinalization$Result -> com.android.tools.r8.internal.vA$a:
     com.android.tools.r8.synthesis.CommittedItems commit -> a
     com.android.tools.r8.com.google.common.collect.ImmutableSet removedSyntheticClasses -> b
-    1:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.com.google.common.collect.ImmutableSet):44:46 -> <init>
-com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.internal.dA:
+    1:3:void <init>(com.android.tools.r8.synthesis.CommittedItems,com.android.tools.r8.com.google.common.collect.ImmutableSet):43:45 -> <init>
+com.android.tools.r8.synthesis.SyntheticItems -> com.android.tools.r8.internal.wA:
     java.util.Map legacyPendingClasses -> c
     java.util.concurrent.ConcurrentHashMap pendingDefinitions -> e
     com.android.tools.r8.com.google.common.collect.ImmutableMap nonLecacySyntheticItems -> f
     boolean $assertionsDisabled -> a
     int nextSyntheticId -> b
     com.android.tools.r8.com.google.common.collect.ImmutableSet legacySyntheticTypes -> d
-    1:1:void <clinit>():36:36 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):93:93 -> <init>
-    2:2:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):99:99 -> <init>
-    3:37:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):69:103 -> <init>
-    1:12:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):108:119 -> a
-    13:32:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticItems.isSynthesizedMethodsContainer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):150:169 -> a
-    13:32:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):119 -> a
-    33:43:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):123:133 -> a
+    1:1:void <clinit>():39:39 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.synthesis.CommittedItems):96:96 -> <init>
+    2:2:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):102:102 -> <init>
+    3:37:void <init>(int,com.android.tools.r8.com.google.common.collect.ImmutableSet,com.android.tools.r8.com.google.common.collect.ImmutableMap):72:106 -> <init>
+    1:12:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):111:122 -> a
+    13:32:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticItems.isSynthesizedMethodsContainer(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory):153:172 -> a
+    13:32:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):122 -> a
+    33:43:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):126:136 -> a
     44:44:com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder.putAll(java.util.Map):286:286 -> a
-    44:44:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):133 -> a
-    45:56:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):134:145 -> a
-    57:58:void lambda$collectSyntheticInputs$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):129:130 -> a
-    59:71:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):195:207 -> a
-    72:72:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):225:225 -> a
-    73:73:java.util.Collection getLegacyPendingClasses():244:244 -> a
-    74:81:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticItems.getSynthesizingContext(com.android.tools.r8.graph.DexProgramClass):248:255 -> a
-    74:81:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):273 -> a
-    82:86:int com.android.tools.r8.synthesis.SyntheticItems.getNextSyntheticId():179:183 -> a
-    82:86:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):274 -> a
-    87:91:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):274:278 -> a
-    92:92:void com.android.tools.r8.synthesis.SyntheticItems.addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):283:283 -> a
-    92:92:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):278 -> a
-    93:93:int com.android.tools.r8.synthesis.SyntheticItems.getNextSyntheticId():180:180 -> a
-    93:93:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):274 -> a
-    94:97:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):262:265 -> a
-    98:98:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):289:289 -> a
-    99:99:com.android.tools.r8.synthesis.CommittedItems com.android.tools.r8.synthesis.SyntheticItems.commitPrunedClasses(com.android.tools.r8.graph.DexApplication,java.util.Set):294:294 -> a
-    99:99:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):289 -> a
-    100:100:com.android.tools.r8.synthesis.CommittedItems commitPrunedClasses(com.android.tools.r8.graph.DexApplication,java.util.Set):294:294 -> a
-    101:104:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):307:310 -> a
-    105:118:com.android.tools.r8.synthesis.SyntheticReference com.android.tools.r8.synthesis.SyntheticMethodReference.rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):50:63 -> a
-    105:118:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):310 -> a
-    119:119:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():34:34 -> a
-    119:119:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):312 -> a
-    120:132:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):312:324 -> a
-    133:133:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):318:318 -> a
-    134:134:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):337:337 -> a
-    135:136:boolean com.android.tools.r8.synthesis.SyntheticItems.verifyClassesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):417:418 -> a
-    135:136:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):337 -> a
-    137:147:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):340:350 -> a
-    148:153:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.synthesis.SyntheticItems.filteredCopy(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set):391:396 -> a
-    148:153:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):351 -> a
-    154:165:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):352:363 -> a
-    166:166:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():34:34 -> a
-    166:166:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):363 -> a
-    167:176:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):363:372 -> a
-    177:182:void filteredAdd(java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):378:383 -> a
-    183:186:void filteredAdd(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):403:406 -> a
-    187:188:void lambda$filteredAdd$1(java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticReference):408:409 -> a
-    1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):87:88 -> b
-    3:9:java.util.Collection getPendingSyntheticClasses():215:221 -> b
-    10:10:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):229:229 -> b
-    11:14:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):426:429 -> b
-    1:1:boolean hasPendingSyntheticClasses():211:211 -> c
-    2:5:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):233:236 -> c
-    1:1:boolean verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):57:57 -> d
-com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.internal.fA:
+    44:44:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):136 -> a
+    45:56:void collectSyntheticInputs(com.android.tools.r8.graph.AppView):137:148 -> a
+    57:58:void lambda$collectSyntheticInputs$0(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):132:133 -> a
+    59:71:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType,java.util.function.Function):193:205 -> a
+    72:72:boolean isCommittedSynthetic(com.android.tools.r8.graph.DexType):223:223 -> a
+    73:73:java.util.Collection getLegacyPendingClasses():242:242 -> a
+    74:77:void addLegacySyntheticClass(com.android.tools.r8.graph.DexProgramClass):260:263 -> a
+    78:78:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):269:269 -> a
+    79:79:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,com.android.tools.r8.ir.conversion.MethodProcessingId):277:277 -> a
+    80:80:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):285:285 -> a
+    81:88:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticItems.getSynthesizingContext(com.android.tools.r8.graph.ProgramDefinition):246:253 -> a
+    81:88:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):288 -> a
+    89:93:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):289:293 -> a
+    94:94:void com.android.tools.r8.synthesis.SyntheticItems.addPendingDefinition(com.android.tools.r8.synthesis.SyntheticDefinition):298:298 -> a
+    94:94:com.android.tools.r8.graph.ProgramMethod createMethod(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer,java.util.function.Supplier):293 -> a
+    95:95:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):304:304 -> a
+    96:96:com.android.tools.r8.synthesis.CommittedItems com.android.tools.r8.synthesis.SyntheticItems.commitPrunedClasses(com.android.tools.r8.graph.DexApplication,java.util.Set):309:309 -> a
+    96:96:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication):304 -> a
+    97:97:com.android.tools.r8.synthesis.CommittedItems commitPrunedClasses(com.android.tools.r8.graph.DexApplication,java.util.Set):309:309 -> a
+    98:101:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):322:325 -> a
+    102:115:com.android.tools.r8.synthesis.SyntheticReference com.android.tools.r8.synthesis.SyntheticMethodReference.rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):50:63 -> a
+    102:115:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):325 -> a
+    116:116:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():34:34 -> a
+    116:116:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):327 -> a
+    117:129:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):327:339 -> a
+    130:130:com.android.tools.r8.synthesis.CommittedItems commitRewrittenWithLens(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):333:333 -> a
+    131:131:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):352:352 -> a
+    132:133:boolean com.android.tools.r8.synthesis.SyntheticItems.verifyClassesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):432:433 -> a
+    132:133:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):352 -> a
+    134:144:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):355:365 -> a
+    145:150:com.android.tools.r8.com.google.common.collect.ImmutableMap com.android.tools.r8.synthesis.SyntheticItems.filteredCopy(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set):406:411 -> a
+    145:150:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):366 -> a
+    151:162:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):367:378 -> a
+    163:163:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():34:34 -> a
+    163:163:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):378 -> a
+    164:173:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.DexApplication,java.util.Set,java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableSet,java.util.concurrent.ConcurrentHashMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,int):378:387 -> a
+    174:179:void filteredAdd(java.util.Set,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):393:398 -> a
+    180:183:void filteredAdd(com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder):418:421 -> a
+    184:185:void lambda$filteredAdd$1(java.util.Set,com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticReference):423:424 -> a
+    1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):90:91 -> b
+    3:7:java.lang.String getNextSyntheticId():182:186 -> b
+    8:8:java.lang.String getNextSyntheticId():183:183 -> b
+    9:9:boolean isPendingSynthetic(com.android.tools.r8.graph.DexType):227:227 -> b
+    10:13:com.android.tools.r8.synthesis.SyntheticFinalization$Result computeFinalSynthetics(com.android.tools.r8.graph.AppView):441:444 -> b
+    1:7:java.util.Collection getPendingSyntheticClasses():213:219 -> c
+    8:11:boolean isSyntheticClass(com.android.tools.r8.graph.DexType):231:234 -> c
+    1:1:boolean verifyNotInternalSynthetic(com.android.tools.r8.graph.DexType):60:60 -> d
+    2:2:boolean hasPendingSyntheticClasses():209:209 -> d
+com.android.tools.r8.synthesis.SyntheticMethodBuilder -> com.android.tools.r8.internal.xA:
     com.android.tools.r8.synthesis.SyntheticClassBuilder parent -> b
     com.android.tools.r8.graph.DexProto proto -> d
     boolean $assertionsDisabled -> a
@@ -76306,10 +76849,10 @@
     2:2:com.android.tools.r8.synthesis.SyntheticMethodBuilder setCode(com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator):38:38 -> a
     3:3:com.android.tools.r8.synthesis.SyntheticMethodBuilder setAccessFlags(com.android.tools.r8.graph.MethodAccessFlags):43:43 -> a
     4:5:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):70:71 -> a
-    6:6:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():488:488 -> a
+    6:6:boolean com.android.tools.r8.graph.DexEncodedMethod.isPublic():492:492 -> a
     6:6:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):72 -> a
     7:7:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):73:73 -> a
-    8:8:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():848:848 -> a
+    8:8:com.android.tools.r8.graph.ParameterAnnotationsList com.android.tools.r8.graph.DexEncodedMethod.getParameterAnnotations():861:861 -> a
     8:8:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):74 -> a
     9:9:boolean isValidSyntheticMethod(com.android.tools.r8.graph.DexEncodedMethod):74:74 -> a
     10:10:com.android.tools.r8.graph.DexMethod com.android.tools.r8.synthesis.SyntheticMethodBuilder.getMethodSignature():78:78 -> a
@@ -76323,37 +76866,49 @@
     17:17:void com.android.tools.r8.graph.DexEncodedMethod.<init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.MethodAccessFlags,com.android.tools.r8.graph.GenericSignature$MethodTypeSignature,com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.ParameterAnnotationsList,com.android.tools.r8.graph.Code,boolean):261:261 -> a
     17:17:com.android.tools.r8.graph.DexEncodedMethod build():57 -> a
     18:18:com.android.tools.r8.graph.DexEncodedMethod build():59:59 -> a
-com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.eA:
+com.android.tools.r8.synthesis.SyntheticMethodBuilder$SyntheticCodeGenerator -> com.android.tools.r8.internal.xA$a:
     com.android.tools.r8.graph.Code generate(com.android.tools.r8.graph.DexMethod) -> a
-com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.internal.gA:
+com.android.tools.r8.synthesis.SyntheticMethodDefinition -> com.android.tools.r8.internal.yA:
     com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.context -> a
     com.android.tools.r8.graph.ProgramMethod method -> b
     1:2:void com.android.tools.r8.synthesis.SyntheticDefinition.<init>(com.android.tools.r8.synthesis.SynthesizingContext):17:18 -> <init>
     1:2:void <init>(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):25 -> <init>
     3:3:void <init>(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.ProgramMethod):26:26 -> <init>
-    1:3:com.android.tools.r8.com.google.common.hash.HashCode computeHash():45:47 -> a
-    4:6:int compareTo(com.android.tools.r8.synthesis.SyntheticMethodDefinition):62:64 -> a
-    1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> b
-    1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> b
-    2:6:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition):52:56 -> b
-    7:7:boolean com.android.tools.r8.graph.DexEncodedMethod.isSyntheticContentEqual(com.android.tools.r8.graph.DexEncodedMethod):343:343 -> b
-    7:7:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition):56 -> b
-    1:1:com.android.tools.r8.graph.DexProgramClass getHolder():40:40 -> c
-    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$compareTo$0(com.android.tools.r8.synthesis.SyntheticMethodDefinition):63:63 -> c
+    1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> a
+    1:1:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> a
+    2:2:com.android.tools.r8.com.google.common.hash.HashCode computeHash(boolean):45:45 -> a
+    3:3:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> a
+    3:3:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> a
+    3:3:com.android.tools.r8.com.google.common.hash.HashCode computeHash(boolean):49 -> a
+    4:7:com.android.tools.r8.com.google.common.hash.HashCode computeHash(boolean):49:52 -> a
+    8:8:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):57:57 -> a
+    9:9:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> a
+    9:9:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> a
+    9:9:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):61 -> a
+    10:10:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):61:61 -> a
+    11:11:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> a
+    11:11:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> a
+    11:11:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):62 -> a
+    12:18:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):62:68 -> a
+    19:19:boolean com.android.tools.r8.graph.DexEncodedMethod.isSyntheticContentEqual(com.android.tools.r8.graph.DexEncodedMethod):343:343 -> a
+    19:19:boolean isEquivalentTo(com.android.tools.r8.synthesis.SyntheticDefinition,boolean):68 -> a
+    20:22:int compareTo(com.android.tools.r8.synthesis.SyntheticMethodDefinition):74:76 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getHolder():40:40 -> b
+    2:2:com.android.tools.r8.graph.DexEncodedMethod lambda$compareTo$0(com.android.tools.r8.synthesis.SyntheticMethodDefinition):75:75 -> b
+    1:1:com.android.tools.r8.graph.ProgramMethod getMethod():30:30 -> c
     1:1:int compareTo(java.lang.Object):19:19 -> compareTo
-    1:1:com.android.tools.r8.graph.ProgramMethod getMethod():30:30 -> d
-    1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():35:35 -> e
-    2:2:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> e
-    2:2:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> e
-    2:2:com.android.tools.r8.synthesis.SyntheticReference toReference():35 -> e
-    3:3:com.android.tools.r8.synthesis.SyntheticReference toReference():35:35 -> e
-    1:1:java.lang.String toString():69:69 -> toString
-com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.internal.hA:
+    1:1:com.android.tools.r8.synthesis.SyntheticReference toReference():35:35 -> d
+    2:2:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():24:24 -> d
+    2:2:com.android.tools.r8.synthesis.SynthesizingContext com.android.tools.r8.synthesis.SyntheticDefinition.getContext():0 -> d
+    2:2:com.android.tools.r8.synthesis.SyntheticReference toReference():35 -> d
+    3:3:com.android.tools.r8.synthesis.SyntheticReference toReference():35:35 -> d
+    1:1:java.lang.String toString():81:81 -> toString
+com.android.tools.r8.synthesis.SyntheticMethodReference -> com.android.tools.r8.internal.zA:
     com.android.tools.r8.graph.DexMethod method -> c
     boolean $assertionsDisabled -> b
     1:1:void <clinit>():19:19 -> <clinit>
     1:2:void <init>(com.android.tools.r8.synthesis.SynthesizingContext,com.android.tools.r8.graph.DexMethod):23:24 -> <init>
-com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.internal.iA:
+com.android.tools.r8.synthesis.SyntheticReference -> com.android.tools.r8.internal.AA:
     com.android.tools.r8.synthesis.SynthesizingContext context -> a
     1:2:void <init>(com.android.tools.r8.synthesis.SynthesizingContext):20:21 -> <init>
     1:1:com.android.tools.r8.synthesis.SynthesizingContext getContext():29:29 -> a
@@ -76403,14 +76958,14 @@
     java.util.Set missingMethods -> d
     java.util.Set missingClasses -> b
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():17:17 -> <clinit>
-    1:4:void <init>(java.util.Set,java.util.Set,java.util.Set):27:30 -> <init>
-    1:3:void lambda$getDiagnosticMessage$0(java.lang.StringBuilder,com.android.tools.r8.tracereferences.Tracer$TracedClassImpl):70:72 -> a
-    4:6:void lambda$getDiagnosticMessage$1(java.lang.StringBuilder,com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl):77:79 -> a
-    7:9:void lambda$getDiagnosticMessage$2(java.lang.StringBuilder,com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl):84:86 -> a
-    1:43:java.lang.String getDiagnosticMessage():45:87 -> getDiagnosticMessage
-    1:1:com.android.tools.r8.origin.Origin getOrigin():35:35 -> getOrigin
-    1:1:com.android.tools.r8.position.Position getPosition():40:40 -> getPosition
+    1:1:void <clinit>():18:18 -> <clinit>
+    1:4:void <init>(java.util.Set,java.util.Set,java.util.Set):28:31 -> <init>
+    1:5:void appendSorted(java.lang.StringBuilder,java.util.Set):46:50 -> a
+    6:6:java.lang.Object lambda$appendSorted$0(com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase):47:47 -> a
+    7:7:void lambda$appendSorted$1(java.lang.StringBuilder,java.lang.String):50:50 -> a
+    1:28:java.lang.String getDiagnosticMessage():55:82 -> getDiagnosticMessage
+    1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
+    1:1:com.android.tools.r8.position.Position getPosition():41:41 -> getPosition
 com.android.tools.r8.tracereferences.PrintUsesFormatter -> com.android.tools.r8.tracereferences.c:
     1:1:void <init>():12:12 -> <init>
     void printPackageNames(java.util.List) -> a
@@ -76424,13 +76979,17 @@
     1:1:void <clinit>():26:26 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     1:1:void lambda$run$0(com.android.tools.r8.tracereferences.TraceReferencesCommand):30:30 -> a
-    2:2:void lambda$runInternal$1(java.util.Set,com.android.tools.r8.ClassFileResourceProvider):42:42 -> a
-    3:3:void lambda$main$2(java.lang.String[]):93:93 -> a
-    1:22:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):35:56 -> b
-    23:39:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):49:65 -> b
-    1:5:void main(java.lang.String[]):89:93 -> main
+    2:2:void lambda$runInternal$1(java.util.Set,com.android.tools.r8.ClassFileResourceProvider):65:65 -> a
+    3:3:void lambda$main$2(java.lang.String[]):98:98 -> a
+    1:10:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):58:67 -> b
+    11:22:void forEachDescriptor(com.android.tools.r8.ProgramResourceProvider,java.util.function.Consumer):35:46 -> b
+    11:22:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):67 -> b
+    23:35:void forEachDescriptor(com.android.tools.r8.ProgramResourceProvider,java.util.function.Consumer):39:51 -> b
+    23:35:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):67 -> b
+    36:37:void runInternal(com.android.tools.r8.tracereferences.TraceReferencesCommand):69:70 -> b
+    1:5:void main(java.lang.String[]):94:98 -> main
     1:1:void run(com.android.tools.r8.tracereferences.TraceReferencesCommand):30:30 -> run
-    2:12:void run(java.lang.String[]):69:79 -> run
+    2:12:void run(java.lang.String[]):74:84 -> run
 com.android.tools.r8.tracereferences.TraceReferencesCommand -> com.android.tools.r8.tracereferences.TraceReferencesCommand:
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> g
     com.android.tools.r8.com.google.common.collect.ImmutableList traceSource -> f
@@ -76439,19 +76998,19 @@
     boolean printVersion -> b
     com.android.tools.r8.com.google.common.collect.ImmutableList library -> d
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:8:void <init>(boolean,boolean,com.android.tools.r8.utils.Reporter,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.tracereferences.TraceReferencesConsumer):49:56 -> <init>
-    9:16:void <init>(boolean,boolean):59:66 -> <init>
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer getConsumer():286:286 -> a
-    1:1:java.util.List getLibrary():274:274 -> b
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):75:75 -> builder
-    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder():83:83 -> builder
-    1:1:com.android.tools.r8.utils.Reporter getReporter():270:270 -> c
-    1:1:java.util.List getSource():282:282 -> d
-    1:1:java.util.List getTarget():278:278 -> e
-    1:1:boolean isPrintHelp():95:95 -> isPrintHelp
-    1:1:boolean isPrintVersion():99:99 -> isPrintVersion
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):87:87 -> parse
-    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):91:91 -> parse
+    1:8:void <init>(boolean,boolean,com.android.tools.r8.utils.Reporter,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.com.google.common.collect.ImmutableList,com.android.tools.r8.tracereferences.TraceReferencesConsumer):54:61 -> <init>
+    9:16:void <init>(boolean,boolean):64:71 -> <init>
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer getConsumer():301:301 -> a
+    1:1:java.util.List getLibrary():289:289 -> b
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder(com.android.tools.r8.DiagnosticsHandler):80:80 -> builder
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder builder():88:88 -> builder
+    1:1:com.android.tools.r8.utils.Reporter getReporter():285:285 -> c
+    1:1:java.util.List getSource():297:297 -> d
+    1:1:java.util.List getTarget():293:293 -> e
+    1:1:boolean isPrintHelp():100:100 -> isPrintHelp
+    1:1:boolean isPrintVersion():104:104 -> isPrintVersion
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin):92:92 -> parse
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.DiagnosticsHandler):96:96 -> parse
 com.android.tools.r8.tracereferences.TraceReferencesCommand$1 -> com.android.tools.r8.tracereferences.TraceReferencesCommand$a:
 com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder -> com.android.tools.r8.tracereferences.TraceReferencesCommand$b:
     com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> g
@@ -76461,84 +77020,89 @@
     boolean printHelp -> a
     boolean printVersion -> b
     com.android.tools.r8.utils.Reporter reporter -> c
-    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.tracereferences.TraceReferencesCommand$1):102:102 -> <init>
-    2:2:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommand$1):102:102 -> <init>
-    3:3:void <init>():116:116 -> <init>
-    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):119:119 -> <init>
-    5:21:void <init>(com.android.tools.r8.DiagnosticsHandler):104:120 -> <init>
-    1:1:boolean isPrintHelp():129:129 -> a
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():228 -> a
-    1:1:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    2:2:boolean isPrintVersion():140:140 -> a
-    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():228 -> a
-    2:2:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    3:8:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():232:237 -> a
-    3:8:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    9:9:void error(com.android.tools.r8.Diagnostic):264:264 -> a
-    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():237 -> a
-    9:9:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    10:14:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():239:243 -> a
-    10:14:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    15:15:void error(com.android.tools.r8.Diagnostic):264:264 -> a
-    15:15:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():243 -> a
-    15:15:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    16:17:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():245:246 -> a
-    16:17:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    18:18:void error(com.android.tools.r8.Diagnostic):264:264 -> a
-    18:18:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():246 -> a
-    18:18:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    19:19:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():248:248 -> a
-    19:19:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    20:20:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():229:229 -> a
-    20:20:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    21:21:boolean isPrintVersion():140:140 -> a
-    21:21:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():229 -> a
-    21:21:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    22:22:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():229:229 -> a
-    22:22:void lambda$build$0(com.android.tools.r8.utils.Box):257 -> a
-    23:24:void lambda$build$0(com.android.tools.r8.utils.Box):257:258 -> a
-    25:25:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintHelp(boolean):134:134 -> a
-    26:29:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):151:154 -> a
-    30:30:void error(com.android.tools.r8.Diagnostic):264:264 -> a
-    30:30:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):154 -> a
-    31:36:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):156:161 -> a
-    37:37:void error(com.android.tools.r8.Diagnostic):264:264 -> a
-    37:37:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):161 -> a
-    38:38:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):164:164 -> a
-    39:39:void error(com.android.tools.r8.Diagnostic):264:264 -> a
-    39:39:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):164 -> a
-    40:40:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):182:182 -> a
-    41:41:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):187:187 -> a
-    42:43:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.util.Collection):192:193 -> a
-    42:43:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):187 -> a
-    44:44:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setConsumer(com.android.tools.r8.tracereferences.TraceReferencesConsumer):223:223 -> a
-    45:52:com.android.tools.r8.tracereferences.TraceReferencesCommand build():253:260 -> a
-    53:53:void error(com.android.tools.r8.Diagnostic):264:264 -> a
-    1:1:com.android.tools.r8.utils.Reporter getReporter():124:124 -> b
-    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintVersion(boolean):145:145 -> b
-    3:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211:211 -> b
-    4:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):216:216 -> b
-    4:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
-    5:8:void addSourceFile(java.nio.file.Path):169:172 -> b
-    5:8:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
-    5:8:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
-    9:9:void error(com.android.tools.r8.Diagnostic):264:264 -> b
-    9:9:void addSourceFile(java.nio.file.Path):172 -> b
-    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
-    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
-    10:13:void addSourceFile(java.nio.file.Path):174:177 -> b
-    10:13:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
-    10:13:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
-    14:14:void error(com.android.tools.r8.Diagnostic):264:264 -> b
-    14:14:void addSourceFile(java.nio.file.Path):177 -> b
-    14:14:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):217 -> b
-    14:14:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):211 -> b
-    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):199:199 -> c
-    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.util.Collection):204:205 -> c
-    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):199 -> c
+    1:1:void <init>(com.android.tools.r8.DiagnosticsHandler,com.android.tools.r8.tracereferences.TraceReferencesCommand$1):107:107 -> <init>
+    2:2:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommand$1):107:107 -> <init>
+    3:3:void <init>():121:121 -> <init>
+    4:4:void <init>(com.android.tools.r8.DiagnosticsHandler):124:124 -> <init>
+    5:21:void <init>(com.android.tools.r8.DiagnosticsHandler):109:125 -> <init>
+    1:1:boolean isPrintHelp():134:134 -> a
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():243 -> a
+    1:1:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    2:2:boolean isPrintVersion():145:145 -> a
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():243 -> a
+    2:2:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    3:8:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():247:252 -> a
+    3:8:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    9:9:void error(com.android.tools.r8.Diagnostic):279:279 -> a
+    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():252 -> a
+    9:9:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    10:14:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():254:258 -> a
+    10:14:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    15:15:void error(com.android.tools.r8.Diagnostic):279:279 -> a
+    15:15:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():258 -> a
+    15:15:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    16:17:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():260:261 -> a
+    16:17:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    18:18:void error(com.android.tools.r8.Diagnostic):279:279 -> a
+    18:18:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():261 -> a
+    18:18:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    19:19:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():263:263 -> a
+    19:19:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    20:20:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():244:244 -> a
+    20:20:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    21:21:boolean isPrintVersion():145:145 -> a
+    21:21:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():244 -> a
+    21:21:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    22:22:com.android.tools.r8.tracereferences.TraceReferencesCommand makeCommand():244:244 -> a
+    22:22:void lambda$build$0(com.android.tools.r8.utils.Box):272 -> a
+    23:24:void lambda$build$0(com.android.tools.r8.utils.Box):272:273 -> a
+    25:25:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintHelp(boolean):139:139 -> a
+    26:29:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):156:159 -> a
+    30:30:void error(com.android.tools.r8.Diagnostic):279:279 -> a
+    30:30:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):159 -> a
+    31:36:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):161:166 -> a
+    37:37:void error(com.android.tools.r8.Diagnostic):279:279 -> a
+    37:37:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):166 -> a
+    38:38:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):169:169 -> a
+    39:39:void error(com.android.tools.r8.Diagnostic):279:279 -> a
+    39:39:void addLibraryOrTargetFile(java.nio.file.Path,com.android.tools.r8.com.google.common.collect.ImmutableList$Builder):169 -> a
+    40:40:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryResourceProvider(com.android.tools.r8.ClassFileResourceProvider):197:197 -> a
+    41:41:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):202:202 -> a
+    42:43:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.util.Collection):207:208 -> a
+    42:43:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addLibraryFiles(java.nio.file.Path[]):202 -> a
+    44:44:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setConsumer(com.android.tools.r8.tracereferences.TraceReferencesConsumer):238:238 -> a
+    45:52:com.android.tools.r8.tracereferences.TraceReferencesCommand build():268:275 -> a
+    53:53:void error(com.android.tools.r8.Diagnostic):279:279 -> a
+    1:1:com.android.tools.r8.utils.Reporter getReporter():129:129 -> b
+    2:2:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder setPrintVersion(boolean):150:150 -> b
+    3:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):226:226 -> b
+    4:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):231:231 -> b
+    4:4:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):226 -> b
+    5:8:void addSourceFile(java.nio.file.Path):174:177 -> b
+    5:8:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):232 -> b
+    5:8:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):226 -> b
+    9:9:void error(com.android.tools.r8.Diagnostic):279:279 -> b
+    9:9:void addSourceFile(java.nio.file.Path):177 -> b
+    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):232 -> b
+    9:9:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):226 -> b
+    10:23:void addSourceFile(java.nio.file.Path):179:192 -> b
+    10:23:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):232 -> b
+    10:23:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):226 -> b
+    24:24:void error(com.android.tools.r8.Diagnostic):279:279 -> b
+    24:24:void addSourceFile(java.nio.file.Path):192 -> b
+    24:24:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.util.Collection):232 -> b
+    24:24:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addSourceFiles(java.nio.file.Path[]):226 -> b
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):214:214 -> c
+    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.util.Collection):219:220 -> c
+    2:3:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder addTargetFiles(java.nio.file.Path[]):214 -> c
 com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$1 -> com.android.tools.r8.tracereferences.TraceReferencesCommand$b$a:
-    1:1:void <init>():116:116 -> <init>
-com.android.tools.r8.tracereferences.TraceReferencesCommandParser -> com.android.tools.r8.tracereferences.e:
+    1:1:void <init>():121:121 -> <init>
+com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder$2 -> com.android.tools.r8.tracereferences.d:
+    java.nio.file.Path val$file -> b
+    com.android.tools.r8.ProgramResource dexResource -> a
+    1:2:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder,java.nio.file.Path):183:184 -> <init>
+    1:1:java.util.Collection getProgramResources():188:188 -> getProgramResources
+com.android.tools.r8.tracereferences.TraceReferencesCommandParser -> com.android.tools.r8.tracereferences.f:
     java.util.Set OPTIONS_WITH_PARAMETER -> a
     java.lang.String USAGE_MESSAGE -> b
     1:21:void <clinit>():27:47 -> <clinit>
@@ -76558,12 +77122,25 @@
     39:44:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):103 -> a
     45:72:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):104:131 -> a
     73:86:com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder parse(java.lang.String[],com.android.tools.r8.origin.Origin,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):130:143 -> a
-com.android.tools.r8.tracereferences.TraceReferencesCommandParser$1 -> com.android.tools.r8.tracereferences.d:
+com.android.tools.r8.tracereferences.TraceReferencesCommandParser$1 -> com.android.tools.r8.tracereferences.e:
     java.nio.file.Path val$finalOutput -> e
     com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder val$builder -> f
     1:1:void <init>(com.android.tools.r8.tracereferences.TraceReferencesCommandParser,com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat,java.nio.file.Path,com.android.tools.r8.tracereferences.TraceReferencesCommand$Builder):144:144 -> <init>
     1:9:void finished():147:155 -> finished
-com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer -> com.android.tools.r8.tracereferences.f:
+com.android.tools.r8.tracereferences.TraceReferencesConsumer -> com.android.tools.r8.tracereferences.TraceReferencesConsumer:
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer emptyConsumer():92:92 -> emptyConsumer
+com.android.tools.r8.tracereferences.TraceReferencesConsumer$ForwardingConsumer -> com.android.tools.r8.tracereferences.TraceReferencesConsumer$ForwardingConsumer:
+    com.android.tools.r8.tracereferences.TraceReferencesConsumer consumer -> b
+    com.android.tools.r8.tracereferences.TraceReferencesConsumer EMPTY_CONSUMER -> a
+    1:1:void <clinit>():99:99 -> <clinit>
+    1:2:void <init>(com.android.tools.r8.tracereferences.TraceReferencesConsumer):103:104 -> <init>
+    1:1:com.android.tools.r8.tracereferences.TraceReferencesConsumer access$000():97:97 -> a
+    1:2:void acceptField(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedField):116:117 -> acceptField
+    1:2:void acceptMethod(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedMethod):123:124 -> acceptMethod
+    1:2:void acceptPackage(com.android.tools.r8.references.PackageReference):130:131 -> acceptPackage
+    1:2:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):109:110 -> acceptType
+    1:2:void finished():137:138 -> finished
+com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer -> com.android.tools.r8.tracereferences.g:
     com.android.tools.r8.tracereferences.TraceReferencesResult$Builder builder -> c
     boolean $assertionsDisabled -> a
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat format -> b
@@ -76579,7 +77156,7 @@
     1:2:void acceptPackage(com.android.tools.r8.references.PackageReference):50:51 -> acceptPackage
     1:2:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):32:33 -> acceptType
     1:2:void finished():56:57 -> finished
-com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat -> com.android.tools.r8.tracereferences.f$a:
+com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat -> com.android.tools.r8.tracereferences.g$a:
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat KEEP_RULES_WITH_ALLOWOBFUSCATION -> c
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat[] $VALUES -> d
     com.android.tools.r8.tracereferences.TraceReferencesFormattingConsumer$OutputFormat KEEP_RULES -> b
@@ -76587,7 +77164,7 @@
     1:7:void <clinit>():13:19 -> <clinit>
     8:8:void <clinit>():11:11 -> <clinit>
     1:1:void <init>(java.lang.String,int):11:11 -> <init>
-com.android.tools.r8.tracereferences.TraceReferencesResult -> com.android.tools.r8.tracereferences.g:
+com.android.tools.r8.tracereferences.TraceReferencesResult -> com.android.tools.r8.tracereferences.h:
     java.util.Map fields -> b
     java.util.Map methods -> c
     java.util.Set keepPackageNames -> d
@@ -76595,7 +77172,7 @@
     java.util.Set types -> a
     1:6:void <init>(java.util.Set,java.util.Map,java.util.Map,java.util.Set,java.util.Set):31:36 -> <init>
     1:1:com.android.tools.r8.tracereferences.TraceReferencesResult$Builder builder():40:40 -> a
-com.android.tools.r8.tracereferences.TraceReferencesResult$Builder -> com.android.tools.r8.tracereferences.g$a:
+com.android.tools.r8.tracereferences.TraceReferencesResult$Builder -> com.android.tools.r8.tracereferences.h$a:
     java.util.Map fields -> c
     java.util.Map methods -> d
     java.util.Set missingDefinition -> e
@@ -76612,7 +77189,7 @@
     1:1:void acceptPackage(com.android.tools.r8.references.PackageReference):78:78 -> acceptPackage
     1:3:void acceptType(com.android.tools.r8.tracereferences.TraceReferencesConsumer$TracedClass):52:54 -> acceptType
     1:1:java.util.Set lambda$acceptMethod$1(com.android.tools.r8.references.ClassReference):70:70 -> b
-com.android.tools.r8.tracereferences.Tracer -> com.android.tools.r8.tracereferences.m:
+com.android.tools.r8.tracereferences.Tracer -> com.android.tools.r8.tracereferences.n:
     com.android.tools.r8.DiagnosticsHandler diagnostics -> b
     com.android.tools.r8.graph.DirectMappedDexApplication application -> c
     com.android.tools.r8.graph.AppInfoWithClassHierarchy appInfo -> d
@@ -76624,39 +77201,39 @@
     14:14:void lambda$run$0(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):249:249 -> a
     15:15:void lambda$run$1(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):250:250 -> a
     1:1:com.android.tools.r8.graph.AppInfoWithClassHierarchy access$400(com.android.tools.r8.tracereferences.Tracer):50:50 -> b
-com.android.tools.r8.tracereferences.Tracer$1 -> com.android.tools.r8.tracereferences.h:
-com.android.tools.r8.tracereferences.Tracer$AccessFlagsImpl -> com.android.tools.r8.tracereferences.i:
+com.android.tools.r8.tracereferences.Tracer$1 -> com.android.tools.r8.tracereferences.i:
+com.android.tools.r8.tracereferences.Tracer$AccessFlagsImpl -> com.android.tools.r8.tracereferences.j:
     com.android.tools.r8.graph.AccessFlags accessFlags -> a
     1:2:void <init>(com.android.tools.r8.graph.AccessFlags):56:57 -> <init>
     1:1:boolean isPrivate():77:77 -> isPrivate
     1:1:boolean isProtected():72:72 -> isProtected
     1:1:boolean isPublic():67:67 -> isPublic
     1:1:boolean isStatic():62:62 -> isStatic
-com.android.tools.r8.tracereferences.Tracer$ClassAccessFlagsImpl -> com.android.tools.r8.tracereferences.j:
+com.android.tools.r8.tracereferences.Tracer$ClassAccessFlagsImpl -> com.android.tools.r8.tracereferences.k:
     1:1:void <init>(com.android.tools.r8.graph.ClassAccessFlags):85:85 -> <init>
     1:1:boolean isEnum():95:95 -> isEnum
     1:1:boolean isInterface():90:90 -> isInterface
-com.android.tools.r8.tracereferences.Tracer$FieldAccessFlagsImpl -> com.android.tools.r8.tracereferences.k:
+com.android.tools.r8.tracereferences.Tracer$FieldAccessFlagsImpl -> com.android.tools.r8.tracereferences.l:
     1:1:void <init>(com.android.tools.r8.graph.FieldAccessFlags):103:103 -> <init>
-com.android.tools.r8.tracereferences.Tracer$MethodAccessFlagsImpl -> com.android.tools.r8.tracereferences.l:
+com.android.tools.r8.tracereferences.Tracer$MethodAccessFlagsImpl -> com.android.tools.r8.tracereferences.m:
     1:1:void <init>(com.android.tools.r8.graph.MethodAccessFlags):111:111 -> <init>
-com.android.tools.r8.tracereferences.Tracer$TracedClassImpl -> com.android.tools.r8.tracereferences.m$a:
+com.android.tools.r8.tracereferences.Tracer$TracedClassImpl -> com.android.tools.r8.tracereferences.n$a:
     1:1:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass,com.android.tools.r8.tracereferences.Tracer$1):160:160 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):164:165 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):163:163 -> <init>
     1:1:java.lang.String toString():176:176 -> toString
-com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl -> com.android.tools.r8.tracereferences.m$b:
+com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl -> com.android.tools.r8.tracereferences.n$b:
     1:1:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.tracereferences.Tracer$1):180:180 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField):183:187 -> <init>
     7:11:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField):184:188 -> <init>
     12:12:void <init>(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.DexEncodedField):183:183 -> <init>
     1:1:java.lang.String toString():199:199 -> toString
-com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl -> com.android.tools.r8.tracereferences.m$c:
+com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl -> com.android.tools.r8.tracereferences.n$c:
     1:1:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.tracereferences.Tracer$1):203:203 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):207:208 -> <init>
     4:4:void <init>(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexEncodedMethod):206:206 -> <init>
     1:1:java.lang.String toString():219:219 -> toString
-com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase -> com.android.tools.r8.tracereferences.n:
+com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase -> com.android.tools.r8.tracereferences.n$d:
     java.lang.Object reference -> b
     java.lang.Object accessFlags -> c
     boolean $assertionsDisabled -> a
@@ -76680,59 +77257,60 @@
     com.android.tools.r8.graph.DexProgramClass context -> e
     1:2:void <init>(com.android.tools.r8.tracereferences.Tracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler):267:268 -> <init>
     3:12:void <init>(com.android.tools.r8.tracereferences.Tracer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.tracereferences.TraceReferencesConsumer,com.android.tools.r8.DiagnosticsHandler):262:271 -> <init>
-    1:451:void registerField(com.android.tools.r8.graph.DexEncodedField):0:450 -> a
-    1:451:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
-    452:452:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    452:452:void registerField(com.android.tools.r8.graph.DexEncodedField):450 -> a
-    452:452:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
-    453:453:void access$100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):256:256 -> a
-    454:455:void collectMissing(com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase,java.util.Set):349:350 -> a
-    456:457:void reportMissingDefinitions():355:356 -> a
-    456:457:void access$200(com.android.tools.r8.tracereferences.Tracer$UseCollector):256 -> a
-    458:458:void setContext(com.android.tools.r8.graph.DexProgramClass):362:362 -> a
-    459:459:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):385:385 -> a
-    460:460:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):421:421 -> a
-    461:461:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    461:461:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):477 -> a
-    462:462:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):479:479 -> a
-    463:470:void registerMethod(com.android.tools.r8.graph.ProgramMethod):454:461 -> a
-    463:470:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    471:471:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    471:471:void registerMethod(com.android.tools.r8.graph.ProgramMethod):462 -> a
-    471:471:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    472:476:void registerMethod(com.android.tools.r8.graph.ProgramMethod):464:468 -> a
-    472:476:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    477:477:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    477:477:void registerMethod(com.android.tools.r8.graph.ProgramMethod):468 -> a
-    477:477:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    478:478:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472:472 -> a
-    478:478:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    479:479:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    479:479:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472 -> a
-    479:479:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    480:480:void registerMethod(com.android.tools.r8.graph.ProgramMethod):473:473 -> a
-    480:480:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
-    481:488:void registerMethod(com.android.tools.r8.graph.ProgramMethod):454:461 -> a
-    489:489:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    489:489:void registerMethod(com.android.tools.r8.graph.ProgramMethod):462 -> a
-    490:494:void registerMethod(com.android.tools.r8.graph.ProgramMethod):464:468 -> a
-    495:495:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    495:495:void registerMethod(com.android.tools.r8.graph.ProgramMethod):468 -> a
-    496:496:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472:472 -> a
-    497:497:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> a
-    497:497:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472 -> a
-    498:498:void registerMethod(com.android.tools.r8.graph.ProgramMethod):473:473 -> a
-    499:503:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):481:485 -> a
-    504:513:void registerCallSite(com.android.tools.r8.graph.DexCallSite):492:501 -> a
-    514:514:boolean lambda$registerCallSite$1(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):502:502 -> a
-    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):401:401 -> b
-    1:6:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):390:395 -> c
-    7:7:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):416:416 -> c
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):367:367 -> d
-    2:6:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):406:410 -> d
-    1:8:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):372:379 -> e
-    9:9:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):431:431 -> e
-    10:10:void registerInstanceOf(com.android.tools.r8.graph.DexType):446:446 -> e
+    1:455:void registerField(com.android.tools.r8.graph.DexEncodedField):0:454 -> a
+    1:455:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
+    456:456:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    456:456:void registerField(com.android.tools.r8.graph.DexEncodedField):454 -> a
+    456:456:void access$800(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexEncodedField):256 -> a
+    457:457:void access$100(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):256:256 -> a
+    458:459:void collectMissing(com.android.tools.r8.tracereferences.Tracer$TracedReferenceBase,java.util.Set):349:350 -> a
+    460:461:void reportMissingDefinitions():355:356 -> a
+    460:461:void access$200(com.android.tools.r8.tracereferences.Tracer$UseCollector):256 -> a
+    462:462:void setContext(com.android.tools.r8.graph.DexProgramClass):362:362 -> a
+    463:463:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):389:389 -> a
+    464:464:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):425:425 -> a
+    465:465:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    465:465:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):481 -> a
+    466:466:void registerSuperType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType):483:483 -> a
+    467:474:void registerMethod(com.android.tools.r8.graph.ProgramMethod):458:465 -> a
+    467:474:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    475:475:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    475:475:void registerMethod(com.android.tools.r8.graph.ProgramMethod):466 -> a
+    475:475:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    476:480:void registerMethod(com.android.tools.r8.graph.ProgramMethod):468:472 -> a
+    476:480:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    481:481:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    481:481:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472 -> a
+    481:481:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    482:482:void registerMethod(com.android.tools.r8.graph.ProgramMethod):476:476 -> a
+    482:482:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    483:483:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    483:483:void registerMethod(com.android.tools.r8.graph.ProgramMethod):476 -> a
+    483:483:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    484:484:void registerMethod(com.android.tools.r8.graph.ProgramMethod):477:477 -> a
+    484:484:void access$900(com.android.tools.r8.tracereferences.Tracer$UseCollector,com.android.tools.r8.graph.ProgramMethod):256 -> a
+    485:492:void registerMethod(com.android.tools.r8.graph.ProgramMethod):458:465 -> a
+    493:493:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    493:493:void registerMethod(com.android.tools.r8.graph.ProgramMethod):466 -> a
+    494:498:void registerMethod(com.android.tools.r8.graph.ProgramMethod):468:472 -> a
+    499:499:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    499:499:void registerMethod(com.android.tools.r8.graph.ProgramMethod):472 -> a
+    500:500:void registerMethod(com.android.tools.r8.graph.ProgramMethod):476:476 -> a
+    501:501:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> a
+    501:501:void registerMethod(com.android.tools.r8.graph.ProgramMethod):476 -> a
+    502:502:void registerMethod(com.android.tools.r8.graph.ProgramMethod):477:477 -> a
+    503:507:void lambda$registerSuperType$0(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod):485:489 -> a
+    508:517:void registerCallSite(com.android.tools.r8.graph.DexCallSite):496:505 -> a
+    518:518:boolean lambda$registerCallSite$1(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.DexEncodedMethod):506:506 -> a
+    1:1:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):405:405 -> b
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):367:367 -> c
+    2:7:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):394:399 -> c
+    8:8:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):420:420 -> c
+    1:5:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):410:414 -> d
+    6:6:void registerInstanceOf(com.android.tools.r8.graph.DexType):450:450 -> d
+    1:12:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):372:383 -> e
+    13:13:void registerNewInstance(com.android.tools.r8.graph.DexType):430:430 -> e
+    14:14:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):435:435 -> e
     1:6:void addMethod(com.android.tools.r8.graph.DexMethod):317:322 -> f
     7:96:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.DexDefinitionSupplier.definitionForHolder(com.android.tools.r8.graph.DexMember):0:89 -> f
     7:96:void addMethod(com.android.tools.r8.graph.DexMethod):322 -> f
@@ -76740,20 +77318,19 @@
     101:101:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedMethodImpl):344:344 -> f
     101:101:void addMethod(com.android.tools.r8.graph.DexMethod):327 -> f
     102:104:void addMethod(com.android.tools.r8.graph.DexMethod):328:330 -> f
-    105:105:void registerNewInstance(com.android.tools.r8.graph.DexType):426:426 -> f
-    1:1:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):436:436 -> g
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):441:441 -> g
-    1:9:void addType(com.android.tools.r8.graph.DexType):279:287 -> h
-    10:10:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedClassImpl):336:336 -> h
-    10:10:void addType(com.android.tools.r8.graph.DexType):288 -> h
-    11:11:boolean isTargetType(com.android.tools.r8.graph.DexType):275:275 -> h
-    11:11:void addType(com.android.tools.r8.graph.DexType):289 -> h
-    12:16:void addType(com.android.tools.r8.graph.DexType):289:293 -> h
-    1:1:boolean isTargetType(com.android.tools.r8.graph.DexType):275:275 -> i
-    2:8:void addField(com.android.tools.r8.graph.DexField):299:305 -> i
-    9:9:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl):340:340 -> i
-    9:9:void addField(com.android.tools.r8.graph.DexField):306 -> i
-    10:14:void addField(com.android.tools.r8.graph.DexField):307:311 -> i
+    105:105:void registerTypeReference(com.android.tools.r8.graph.DexType):445:445 -> f
+    1:9:void addType(com.android.tools.r8.graph.DexType):279:287 -> g
+    10:10:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedClassImpl):336:336 -> g
+    10:10:void addType(com.android.tools.r8.graph.DexType):288 -> g
+    11:11:boolean isTargetType(com.android.tools.r8.graph.DexType):275:275 -> g
+    11:11:void addType(com.android.tools.r8.graph.DexType):289 -> g
+    12:16:void addType(com.android.tools.r8.graph.DexType):289:293 -> g
+    17:17:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):440:440 -> g
+    1:1:boolean isTargetType(com.android.tools.r8.graph.DexType):275:275 -> h
+    1:7:void addField(com.android.tools.r8.graph.DexField):299:305 -> i
+    8:8:void checkMissingDefinition(com.android.tools.r8.tracereferences.Tracer$TracedFieldImpl):340:340 -> i
+    8:8:void addField(com.android.tools.r8.graph.DexField):306 -> i
+    9:13:void addField(com.android.tools.r8.graph.DexField):307:311 -> i
 com.android.tools.r8.utils.AarArchiveResourceProvider -> com.android.tools.r8.utils.a:
     java.nio.file.Path archive -> c
     com.android.tools.r8.origin.Origin origin -> b
@@ -76901,10 +77478,10 @@
     97:97:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):494:494 -> a
     98:132:void dump(java.nio.file.Path,com.android.tools.r8.utils.InternalOptions):461:495 -> a
     133:136:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):500:503 -> a
-    137:137:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():544:544 -> a
+    137:137:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():545:545 -> a
     137:137:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):505 -> a
     138:138:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):505:505 -> a
-    139:139:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
+    139:139:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> a
     139:139:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):506 -> a
     140:140:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):506:506 -> a
     141:141:java.lang.String getBuildPropertiesContents(com.android.tools.r8.utils.InternalOptions):502:502 -> a
@@ -77409,7 +77986,7 @@
     1:1:void <init>(java.lang.String,java.util.Map,com.android.tools.r8.utils.CfLineToMethodMapper$1):114:114 -> <init>
     2:4:void <init>(java.lang.String,java.util.Map):120:122 -> <init>
     1:1:void visitLineNumber(int,com.android.tools.r8.org.objectweb.asm.Label):127:127 -> b
-com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.H4:
+com.android.tools.r8.utils.CfgPrinter -> com.android.tools.r8.internal.I4:
     java.util.Stack opened -> c
     java.lang.StringBuilder builder -> b
     int nextUnusedValue -> d
@@ -77435,14 +78012,14 @@
     7:7:com.android.tools.r8.utils.CfgPrinter sp():65:65 -> c
     1:2:com.android.tools.r8.utils.CfgPrinter print(java.lang.String):49:50 -> d
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.J4:
+com.android.tools.r8.utils.ChainableStringConsumer -> com.android.tools.r8.internal.K4:
     com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.ChainableStringConsumer wrap(java.util.function.Consumer):15:15 -> a
-com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.I4:
+com.android.tools.r8.utils.ChainableStringConsumer$1 -> com.android.tools.r8.internal.J4:
     java.util.function.Consumer val$consumer -> a
     1:1:void <init>(java.util.function.Consumer):15:15 -> <init>
     1:1:com.android.tools.r8.utils.ChainableStringConsumer accept(java.lang.String):18:18 -> a
-com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.y5:
+com.android.tools.r8.utils.ClassMap -> com.android.tools.r8.internal.A5:
     java.util.Map classes -> b
     java.util.concurrent.atomic.AtomicReference classProvider -> c
     boolean $assertionsDisabled -> a
@@ -77464,8 +78041,8 @@
     com.android.tools.r8.graph.ClassKind getClassKind() -> c
     1:1:boolean isFullyLoaded():228:228 -> d
     1:1:java.lang.String toString():81:81 -> toString
-com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.w5:
-com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.x5:
+com.android.tools.r8.utils.ClassMap$1 -> com.android.tools.r8.internal.y5:
+com.android.tools.r8.utils.ClassMap$ConcurrentClassLoader -> com.android.tools.r8.internal.z5:
     com.android.tools.r8.graph.DexType type -> d
     boolean ready -> f
     boolean $assertionsDisabled -> a
@@ -77484,7 +78061,7 @@
     66:66:void lambda$get$0(com.android.tools.r8.graph.DexClass):266 -> a
     67:67:void lambda$get$0(com.android.tools.r8.graph.DexClass):266:266 -> a
     1:1:java.lang.Object get():234:234 -> get
-com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.S5:
+com.android.tools.r8.utils.ClassProvider -> com.android.tools.r8.internal.W5:
     com.android.tools.r8.graph.ClassKind classKind -> a
     1:2:void <init>(com.android.tools.r8.graph.ClassKind):28:29 -> <init>
     void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer) -> a
@@ -77495,8 +78072,8 @@
     3:3:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):66 -> a
     4:7:com.android.tools.r8.utils.ClassProvider forPreloadedClasses(com.android.tools.r8.graph.ClassKind,java.util.Collection):67:70 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> b
-com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.O5:
-com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.P5:
+com.android.tools.r8.utils.ClassProvider$1 -> com.android.tools.r8.internal.S5:
+com.android.tools.r8.utils.ClassProvider$ClassFileResourceReader -> com.android.tools.r8.internal.T5:
     com.android.tools.r8.graph.JarApplicationReader reader -> d
     com.android.tools.r8.graph.ClassKind classKind -> b
     com.android.tools.r8.ClassFileResourceProvider provider -> c
@@ -77508,21 +78085,21 @@
     9:9:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):102:102 -> a
     10:12:java.util.Collection collectTypes():109:111 -> a
     1:1:java.lang.String toString():118:118 -> toString
-com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.Q5:
+com.android.tools.r8.utils.ClassProvider$CombinedClassProvider -> com.android.tools.r8.internal.U5:
     java.util.List providers -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List,com.android.tools.r8.utils.ClassProvider$1):148:148 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,java.util.List):152:153 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):158:159 -> a
     3:5:java.util.Collection collectTypes():165:167 -> a
     1:8:java.lang.String toString():174:181 -> toString
-com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.R5:
+com.android.tools.r8.utils.ClassProvider$PreloadedClassProvider -> com.android.tools.r8.internal.V5:
     com.android.tools.r8.com.google.common.collect.Multimap classes -> b
     1:1:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap,com.android.tools.r8.utils.ClassProvider$1):122:122 -> <init>
     2:3:void <init>(com.android.tools.r8.graph.ClassKind,com.android.tools.r8.com.google.common.collect.Multimap):126:127 -> <init>
     1:2:void collectClass(com.android.tools.r8.graph.DexType,java.util.function.Consumer):132:133 -> a
     3:3:java.util.Collection collectTypes():139:139 -> a
     1:1:java.lang.String toString():144:144 -> toString
-com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.q6:
+com.android.tools.r8.utils.ClasspathClassCollection -> com.android.tools.r8.internal.v6:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):14:14 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):12:12 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12:12 -> a
@@ -77539,20 +78116,22 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):12 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():29:29 -> c
     1:1:java.lang.String toString():34:34 -> toString
-com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.R6:
+com.android.tools.r8.utils.ComparatorUtils -> com.android.tools.r8.internal.W6:
     boolean $assertionsDisabled -> a
-    1:1:void <clinit>():9:9 -> <clinit>
-    1:3:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):17:19 -> a
-    4:7:int compareInts(int[]):27:30 -> a
-    8:10:int compareIntArray(int[],int[]):36:38 -> a
-    11:13:int compareShortArray(short[],short[]):44:46 -> a
-    14:14:java.util.Comparator arrayComparator():52:52 -> a
-    15:15:java.util.Comparator arrayComparator(java.util.Comparator):56:56 -> a
-    16:18:int lambda$arrayComparator$1(java.util.Comparator,java.lang.Object[],java.lang.Object[]):57:59 -> a
-    1:1:java.util.Comparator listComparator(java.util.Comparator):16:16 -> b
-com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.n7:
+    1:1:void <clinit>():10:10 -> <clinit>
+    1:3:int lambda$listComparator$0(java.util.Comparator,java.util.List,java.util.List):18:20 -> a
+    4:7:int compareInts(int[]):28:31 -> a
+    8:10:int compareIntArray(int[],int[]):37:39 -> a
+    11:13:int compareShortArray(short[],short[]):45:47 -> a
+    14:14:java.util.Comparator arrayComparator():53:53 -> a
+    15:15:java.util.Comparator arrayComparator(java.util.Comparator):57:57 -> a
+    16:18:int lambda$arrayComparator$1(java.util.Comparator,java.lang.Object[],java.lang.Object[]):58:60 -> a
+    19:19:int lambda$unreachableComparator$2(java.lang.Object,java.lang.Object):68:68 -> a
+    1:1:java.util.Comparator listComparator(java.util.Comparator):17:17 -> b
+    2:2:java.util.Comparator unreachableComparator():67:67 -> b
+com.android.tools.r8.utils.Consumer3 -> com.android.tools.r8.internal.s7:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.o7:
+com.android.tools.r8.utils.ConsumerUtils -> com.android.tools.r8.internal.t7:
     void lambda$emptyBiConsumer$4(java.lang.Object,java.lang.Object) -> a
     void lambda$emptyConsumer$3(java.lang.Object) -> a
     1:1:java.util.function.Consumer acceptIfNotSeen(java.util.function.Consumer,java.util.Set):23:23 -> a
@@ -77561,7 +78140,7 @@
     void lambda$emptyThrowingConsumer$5(java.lang.Object) -> b
     1:1:java.util.function.Consumer emptyConsumer():31:31 -> b
     1:1:com.android.tools.r8.utils.ThrowingConsumer emptyThrowingConsumer():39:39 -> c
-com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.Y7:
+com.android.tools.r8.utils.DescriptorUtils -> com.android.tools.r8.internal.d8:
     java.util.Map typeNameToLetterMap -> a
     boolean $assertionsDisabled -> b
     int $r8$clinit -> c
@@ -77633,13 +78212,13 @@
     6:10:boolean isDescriptor(java.lang.String):245 -> x
     1:6:boolean isValidJavaType(java.lang.String):123:128 -> y
     1:2:java.lang.String javaTypeToDescriptor(java.lang.String):67:68 -> z
-com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.Y7$a:
+com.android.tools.r8.utils.DescriptorUtils$ModuleAndDescriptor -> com.android.tools.r8.internal.d8$a:
     java.lang.String module -> a
     java.lang.String descriptor -> b
     1:3:void <init>(java.lang.String,java.lang.String):590:592 -> <init>
     1:1:java.lang.String getDescriptor():600:600 -> a
     1:1:java.lang.String getModule():596:596 -> b
-com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.L8:
+com.android.tools.r8.utils.DexVersion -> com.android.tools.r8.internal.U8:
     com.android.tools.r8.utils.DexVersion[] $VALUES -> e
     int dexVersion -> f
     com.android.tools.r8.utils.DexVersion V35 -> a
@@ -77665,7 +78244,7 @@
     5:5:java.util.Optional getDexVersion(int):87:87 -> b
     6:6:java.util.Optional getDexVersion(int):85:85 -> b
     7:7:java.util.Optional getDexVersion(int):83:83 -> b
-com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.O8:
+com.android.tools.r8.utils.DirectoryBuilder -> com.android.tools.r8.internal.X8:
     com.android.tools.r8.origin.Origin origin -> b
     java.nio.file.Path root -> a
     1:3:void <init>(java.nio.file.Path):24:26 -> <init>
@@ -77679,7 +78258,7 @@
     24:24:void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler):73:73 -> a
     25:25:java.nio.file.Path getPath():83:83 -> a
     1:1:com.android.tools.r8.origin.Origin getOrigin():78:78 -> getOrigin
-com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Q8:
+com.android.tools.r8.utils.DisjointSets -> com.android.tools.r8.internal.Z8:
     java.util.Map parent -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():16:16 -> <clinit>
@@ -77695,7 +78274,7 @@
     1:1:java.util.Set lambda$collectSets$0(java.lang.Object):143:143 -> e
     1:3:java.lang.Object makeSet(java.lang.Object):27:29 -> f
     1:12:java.lang.String toString():150:161 -> toString
-com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.o9:
+com.android.tools.r8.utils.EncodedValueUtils -> com.android.tools.r8.internal.x9:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():9:9 -> <clinit>
     1:6:int putBitsFromRightZeroExtended(com.android.tools.r8.dex.DexOutputBuffer,long,int):84:89 -> a
@@ -77724,7 +78303,7 @@
     1:1:java.lang.String getDiagnosticMessage():65:65 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():51:51 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():56:56 -> getPosition
-com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.da:
+com.android.tools.r8.utils.ExceptionUtils -> com.android.tools.r8.internal.ma:
     void com.android.tools.r8.utils.ForEachableUtils.lambda$empty$0(java.util.function.Consumer) -> a
     1:1:com.android.tools.r8.utils.ForEachable com.android.tools.r8.utils.ForEachableUtils.empty():10:10 -> a
     2:3:java.lang.Object com.android.tools.r8.utils.PredicateUtils.findFirst(java.lang.Object[],java.util.function.Predicate):13:14 -> a
@@ -77783,9 +78362,9 @@
     boolean com.android.tools.r8.utils.IdentifierUtils.isSimpleNameChar(int) -> d
     1:10:com.android.tools.r8.position.Position getPosition(java.lang.Throwable):159:168 -> d
     boolean com.android.tools.r8.utils.IdentifierUtils.isUnicodeSpace(int) -> e
-com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.da$a:
-com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.da$b:
-com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.ea:
+com.android.tools.r8.utils.ExceptionUtils$CompileAction -> com.android.tools.r8.internal.ma$a:
+com.android.tools.r8.utils.ExceptionUtils$MainAction -> com.android.tools.r8.internal.ma$b:
+com.android.tools.r8.utils.ExceptionUtils$OriginAttachmentException -> com.android.tools.r8.internal.na:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:3:void <init>(java.lang.RuntimeException,com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):258:260 -> <init>
@@ -77851,7 +78430,7 @@
 com.android.tools.r8.utils.FeatureClassMapping$SpecificationOrigin -> com.android.tools.r8.utils.FeatureClassMapping$e:
     1:1:void <init>(java.nio.file.Path):72:72 -> <init>
     1:1:java.lang.String part():77:77 -> part
-com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Ha:
+com.android.tools.r8.utils.FieldSignatureEquivalence -> com.android.tools.r8.internal.Qa:
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     boolean ignoreName -> c
     com.android.tools.r8.utils.FieldSignatureEquivalence INSTANCE -> a
@@ -77865,7 +78444,7 @@
     7:10:int doHash(java.lang.Object):14 -> a
     11:11:com.android.tools.r8.utils.FieldSignatureEquivalence get():28:28 -> a
     1:1:com.android.tools.r8.utils.FieldSignatureEquivalence getEquivalenceIgnoreName():32:32 -> b
-com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.Na:
+com.android.tools.r8.utils.FileUtils -> com.android.tools.r8.internal.Wa:
     boolean isAndroid -> a
     boolean $assertionsDisabled -> b
     1:16:void <clinit>():21:36 -> <clinit>
@@ -77889,12 +78468,12 @@
 com.android.tools.r8.utils.FilteredArchiveClassFileProvider -> com.android.tools.r8.utils.m:
     1:1:void <init>(com.android.tools.r8.shaking.FilteredClassPath):13:13 -> <init>
     1:1:boolean lambda$new$0(com.android.tools.r8.shaking.FilteredClassPath,java.lang.String):13:13 -> a
-com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.Ua:
+com.android.tools.r8.utils.FlagFile$FlagFileOrigin -> com.android.tools.r8.internal.db:
     java.nio.file.Path path -> e
     1:2:void <init>(java.nio.file.Path):23:24 -> <init>
     1:1:java.lang.String part():29:29 -> part
-com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.fb:
-com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.ec:
+com.android.tools.r8.utils.ForEachable -> com.android.tools.r8.internal.ob:
+com.android.tools.r8.utils.HeapUtils -> com.android.tools.r8.internal.nc:
     com.sun.management.HotSpotDiagnosticMXBean hotSpotDiagnosticMXBean -> a
     1:3:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():19:21 -> a
     1:3:void dumpHeap(java.nio.file.Path,boolean):35 -> a
@@ -77904,29 +78483,29 @@
     6:8:void com.android.tools.r8.utils.HeapUtils.initHotSpotMBean():22:24 -> a
     6:8:void dumpHeap(java.nio.file.Path,boolean):35 -> a
     9:9:void dumpHeap(java.nio.file.Path,boolean):36:36 -> a
-com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.rc:
+com.android.tools.r8.utils.IROrdering -> com.android.tools.r8.internal.Ac:
     java.lang.Iterable order(java.lang.Iterable) -> a
-com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.rc$a:
+com.android.tools.r8.utils.IROrdering$IdentityIROrdering -> com.android.tools.r8.internal.Ac$a:
     com.android.tools.r8.utils.IROrdering$IdentityIROrdering INSTANCE -> a
     1:1:void <clinit>():25:25 -> <clinit>
     1:1:void <init>():27:27 -> <init>
     java.lang.Iterable order(java.lang.Iterable) -> a
     1:1:com.android.tools.r8.utils.IROrdering$IdentityIROrdering getInstance():30:30 -> a
-com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.rc$b:
+com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering -> com.android.tools.r8.internal.Ac$b:
     com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering INSTANCE -> a
     1:1:void <clinit>():51:51 -> <clinit>
     1:1:void <init>():53:53 -> <init>
     1:1:com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering getInstance():56:56 -> a
     2:3:java.util.List com.android.tools.r8.utils.IROrdering$NondeterministicIROrdering.order(java.lang.Iterable):61:62 -> a
     2:3:java.lang.Iterable order(java.lang.Iterable):49 -> a
-com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.mf:
+com.android.tools.r8.utils.IntBox -> com.android.tools.r8.internal.zf:
     int value -> a
     1:1:void <init>():11:11 -> <init>
     2:3:void <init>(int):13:14 -> <init>
     1:1:int get():18:18 -> a
     2:2:void set(int):30:30 -> a
     1:1:int getAndIncrement():22:22 -> b
-com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Ff:
+com.android.tools.r8.utils.IntObjConsumer -> com.android.tools.r8.internal.Sf:
     void accept(int,java.lang.Object) -> a
 com.android.tools.r8.utils.InternalArchiveClassFileProvider -> com.android.tools.r8.utils.n:
     java.util.zip.ZipFile openedZipFile -> e
@@ -77951,389 +78530,397 @@
     25:25:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,com.android.tools.r8.origin.Origin):30:30 -> getProgramResource
     25:25:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     26:26:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
-com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.eg:
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> f0
+com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.rg:
     boolean enableTreeShakingOfLibraryMethodOverrides -> P
-    com.android.tools.r8.dex.Marker marker -> u0
+    boolean enableStringSwitchConversion -> b0
+    java.util.Set invalidLibraryClasses -> v1
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> e
-    boolean minimalMainDex -> Z0
+    java.util.function.Consumer syntheticProguardRulesConsumer -> t1
     boolean enableUnusedInterfaceRemoval -> y
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> h1
-    boolean configurationDebugging -> R0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> l1
+    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> n1
     boolean disableInliningOfLibraryMethodOverrides -> G
-    int callGraphLikelySpuriousCallEdgeThreshold -> T
-    boolean enableMinification -> N0
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> V0
-    java.util.List logArgumentsFilter -> B0
-    boolean processCovariantReturnTypeAnnotations -> J0
-    boolean skipReadingDexCode -> f1
+    boolean enableTreeShaking -> N0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> q1
+    boolean relocatorCompilation -> o1
+    java.lang.String synthesizedClassPrefix -> n0
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> p1
+    boolean enableLambdaMerging -> E0
     boolean enableClassStaticizer -> I
-    boolean readCompileTimeAnnotations -> A0
+    boolean intermediate -> A0
+    boolean minimalMainDex -> b1
     int applyInliningToInlineeMaxDepth -> D
     boolean encodeChecksums -> Q
     boolean libraryInterfacesMayHaveStaticInitialization -> r
-    boolean intermediate -> z0
     boolean enableDevirtualization -> z
-    boolean ignoreMainDexMissingClasses -> r0
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> d1
+    boolean invalidDebugInfoFatal -> r0
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> F0
     com.android.tools.r8.ProgramConsumer programConsumer -> g
     boolean enableClassInlining -> H
-    int classInliningInstructionLimit -> U
+    int callGraphLikelySpuriousCallEdgeThreshold -> U
+    com.android.tools.r8.dex.Marker marker -> v0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> s1
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> h
-    java.util.Map warningInvalidDebugInfo -> e1
-    boolean enableUninstantiatedTypeOptimizationForInterfaces -> j0
+    java.util.Map missingEnclosingMembers -> e1
+    boolean enableUninstantiatedTypeOptimization -> j0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> f0
     boolean enableNameReflectionOptimization -> N
     boolean passthroughDexCode -> o
-    boolean enableRedundantFieldLoadElimination -> g0
-    boolean enableEnumValueOptimization -> c0
-    java.util.List methodsFilter -> x0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> g0
     boolean enableVerticalClassMerging -> w
-    boolean skipIR -> S0
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> W0
+    java.util.Set reportedMissingForDesugaring -> u1
+    boolean configurationDebugging -> S0
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> E
-    int classInliningInstructionAllowance -> V
-    boolean ignoreMissingClasses -> O0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> i1
-    java.lang.String synthesizedClassPrefix -> m0
-    boolean lookupLibraryBeforeProgram -> K0
+    int classInliningInstructionLimit -> V
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> r1
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> W0
+    boolean enableMinification -> O0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> i1
+    java.util.List logArgumentsFilter -> C0
+    boolean processCovariantReturnTypeAnnotations -> K0
+    com.android.tools.r8.StringConsumer configurationConsumer -> m1
+    int minimumStringSwitchSize -> c0
     boolean enableStringConcatenationOptimization -> O
-    boolean enableNestBasedAccessDesugaring -> F0
-    java.util.Map warningInvalidParameterAnnotations -> d1
     boolean enableNeverMergePrefixes -> p
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> R0
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> V0
+    boolean readCompileTimeAnnotations -> B0
+    boolean enableInheritanceClassInDexDistributor -> c1
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> x0
     com.android.tools.r8.utils.Reporter reporter -> f
     boolean enableArgumentRemoval -> x
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> i
-    boolean enableCfByteCodePassThrough -> s0
+    int threadCount -> o0
+    boolean ignoreMainDexMissingClasses -> s0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> J0
     boolean enableInliningOfInvokesWithNullableReceivers -> F
-    int inliningInstructionLimit -> W
-    boolean useSmaliSyntax -> o0
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> e0
-    boolean enableRedundantConstNumberOptimization -> k0
-    boolean enableEnumSwitchMapRemoval -> d0
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> X0
+    int classInliningInstructionAllowance -> W
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> k0
+    boolean enableEnumValueOptimization -> d0
     com.android.tools.r8.graph.DexItemFactory itemFactory -> d
+    java.util.List mainDexKeepRules -> a1
     boolean enableDeterminismAnalysis -> L
     boolean enableStaticClassMerging -> u
-    java.util.Set invalidLibraryClasses -> t1
     java.lang.String dumpInputToDirectory -> n
-    boolean debug -> T0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> r1
-    boolean forceProguardCompatibility -> P0
-    int inliningInstructionAllowance -> X
-    boolean enableMainDexListCheck -> L0
-    boolean relocatorCompilation -> m1
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> j1
-    com.android.tools.r8.ir.desugar.DesugaredLibraryConfiguration desugaredLibraryConfiguration -> l1
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> o1
+    java.util.List methodsFilter -> y0
+    boolean enablePackagePrivateAwarePublicization -> T
+    boolean skipIR -> T0
+    boolean ignoreMissingClasses -> P0
+    int inliningInstructionLimit -> X
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> X0
+    boolean lookupLibraryBeforeProgram -> L0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> j1
+    boolean enableNestReduction -> H0
     boolean applyInliningToInlinee -> C
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> n1
     boolean enableServiceLoaderRewriting -> M
-    int minimumStringSwitchSize -> b0
-    boolean enableNestReduction -> G0
-    java.util.Map missingEnclosingMembers -> c1
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> w0
-    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> U0
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> Q0
+    boolean enableNestBasedAccessDesugaring -> G0
+    boolean skipReadingDexCode -> h1
+    java.util.Set extensiveLoggingFilter -> w0
     java.lang.String dumpInputToFile -> m
-    boolean enableLoadStoreOptimization -> C0
     boolean enableHorizontalClassMerging -> v
-    java.util.List mainDexKeepRules -> Y0
-    int threadCount -> n0
-    boolean hasMarker -> t0
-    boolean verbose -> p0
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> b1
+    boolean enableCfByteCodePassThrough -> t0
+    boolean useSmaliSyntax -> p0
     com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> a
-    int inliningMonitorEnterValuesAllowance -> Y
-    boolean enablePcDebugInfoOutput -> l0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> I0
-    boolean enableValuePropagation -> h0
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> q1
+    int inliningInstructionAllowance -> Y
+    boolean enableRedundantConstNumberOptimization -> l0
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> I0
+    int minApiLevel -> z0
+    boolean enableRedundantFieldLoadElimination -> h0
+    java.util.Map warningInvalidDebugInfo -> g1
+    boolean enableEnumSwitchMapRemoval -> e0
     java.util.function.BiPredicate dexClassChecksumFilter -> R
+    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> Y0
     boolean enableInitializedClassesAnalysis -> J
-    boolean enableStringSwitchConversion -> a0
     boolean printTimes -> k
-    java.util.Set reportedMissingForDesugaring -> s1
     int SUPPORTED_DEX_VERSION -> b
     boolean enableFieldAssignmentTracker -> s
-    int inliningControlFlowResolutionBlocksThreshold -> Z
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> g1
+    boolean debug -> U0
+    int inliningMonitorEnterValuesAllowance -> Z
+    boolean forceProguardCompatibility -> Q0
     java.util.List outputInspections -> j
-    boolean enableTreeShaking -> M0
-    com.android.tools.r8.StringConsumer configurationConsumer -> k1
+    boolean enableMainDexListCheck -> M0
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> k1
     java.util.Set neverMergePrefixes -> q
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> p1
     boolean enableInlining -> A
-    boolean enableLambdaMerging -> D0
-    boolean enableInheritanceClassInDexDistributor -> a1
-    java.util.Set extensiveLoggingFilter -> v0
+    boolean enableLoadStoreOptimization -> D0
+    int inliningControlFlowResolutionBlocksThreshold -> a0
     boolean enableSideEffectAnalysis -> K
     boolean printMemory -> l
     boolean cfToCfDesugar -> S
     boolean enableFieldBitAccessAnalysis -> t
-    boolean invalidDebugInfoFatal -> q0
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> E0
-    int minApiLevel -> y0
+    boolean hasMarker -> u0
+    boolean verbose -> q0
+    boolean enablePcDebugInfoOutput -> m0
+    java.util.Map warningInvalidParameterAnnotations -> f1
     boolean enableEnumUnboxing -> B
-    boolean enableUninstantiatedTypeOptimization -> i0
+    boolean enableValuePropagation -> i0
     boolean $assertionsDisabled -> c
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> H0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> Z0
     1:19:void <clinit>():92:110 -> <clinit>
     1:1:void <init>():140:140 -> <init>
-    2:681:void <init>():132:811 -> <init>
-    682:686:void <init>():141:145 -> <init>
-    687:687:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):149:149 -> <init>
-    688:1367:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):132:811 -> <init>
-    1368:1375:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):150:157 -> <init>
-    1376:1376:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):161:161 -> <init>
-    1377:2056:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:811 -> <init>
-    2057:2071:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):162:176 -> <init>
-    1:3:void disableAllOptimizations():191:193 -> A
-    1:17:void disableGlobalOptimizations():197:213 -> B
-    1:1:void disableNameReflectionOptimization():1385:1385 -> C
-    1:5:void enableProtoShrinking():181:185 -> D
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():663:671 -> E
-    1:9:java.util.Set getExtensiveLoggingFilter():637:645 -> F
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():385:385 -> G
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():424:424 -> G
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():386 -> G
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():387:387 -> G
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():428:428 -> G
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():388 -> G
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():389:389 -> G
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> G
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():390 -> G
-    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():391:393 -> G
-    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():125:125 -> H
-    1:1:boolean hasConsumer():381:381 -> I
-    1:1:boolean hasMethodsFilter():1103:1103 -> J
-    1:1:boolean hasProguardConfiguration():121:121 -> K
-    1:1:boolean hasUsageInformationConsumer():758:758 -> L
-    1:1:boolean isDesugaredLibraryCompilation():397:397 -> M
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> N
-    1:1:boolean isDesugaring():436 -> N
-    2:2:boolean isDesugaring():436:436 -> N
-    1:1:boolean isGeneratingClassFiles():432:432 -> O
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():424:424 -> P
-    1:1:boolean isGeneratingDex():420 -> P
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():428:428 -> P
-    2:2:boolean isGeneratingDex():420 -> P
-    1:6:boolean isInterfaceMethodDesugaringEnabled():1465:1470 -> Q
-    1:1:boolean isKeepAttributesSignatureEnabled():565:565 -> R
-    1:3:boolean isMinifying():537:537 -> S
-    5:5:boolean isMinifying():539:539 -> S
-    1:1:boolean isRelease():527:527 -> T
-    1:2:boolean isRepackagingEnabled():554:555 -> U
-    1:3:boolean isShrinking():531:531 -> V
-    5:5:boolean isShrinking():533:533 -> V
-    1:1:boolean isStringSwitchConversionEnabled():1474:1474 -> W
-    1:2:boolean keepInnerClassStructure():583:584 -> X
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():629:629 -> Y
-    1:32:boolean printWarnings():1028:1059 -> Z
-    33:72:boolean printWarnings():1055:1094 -> Z
+    2:687:void <init>():132:817 -> <init>
+    688:692:void <init>():141:145 -> <init>
+    693:693:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):149:149 -> <init>
+    694:1379:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):132:817 -> <init>
+    1380:1387:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):150:157 -> <init>
+    1388:1388:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):161:161 -> <init>
+    1389:2074:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):132:817 -> <init>
+    2075:2089:void <init>(com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):162:176 -> <init>
+    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():117:117 -> A
+    1:3:void disableAllOptimizations():190:192 -> B
+    1:17:void disableGlobalOptimizations():196:212 -> C
+    1:1:void disableNameReflectionOptimization():1403:1403 -> D
+    1:6:void enableProtoShrinking():181:186 -> E
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():669:677 -> F
+    1:9:java.util.Set getExtensiveLoggingFilter():643:651 -> G
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():386:386 -> H
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():425:425 -> H
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():387 -> H
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():388:388 -> H
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():429:429 -> H
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():389 -> H
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():390:390 -> H
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> H
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():391 -> H
+    7:9:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():392:394 -> H
+    1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():125:125 -> I
+    1:1:boolean hasConsumer():382:382 -> J
+    1:1:boolean hasMethodsFilter():1109:1109 -> K
+    1:1:boolean hasProguardConfiguration():121:121 -> L
+    1:1:boolean hasUsageInformationConsumer():764:764 -> M
+    1:1:boolean isDesugaredLibraryCompilation():398:398 -> N
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> O
+    1:1:boolean isDesugaring():437 -> O
+    2:2:boolean isDesugaring():437:437 -> O
+    1:1:boolean isGeneratingClassFiles():433:433 -> P
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():425:425 -> Q
+    1:1:boolean isGeneratingDex():421 -> Q
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():429:429 -> Q
+    2:2:boolean isGeneratingDex():421 -> Q
+    1:6:boolean isInterfaceMethodDesugaringEnabled():1483:1488 -> R
+    1:1:boolean isKeepAttributesSignatureEnabled():566:566 -> S
+    1:3:boolean isMinifying():538:538 -> T
+    5:5:boolean isMinifying():540:540 -> T
+    1:1:boolean isRelease():528:528 -> U
+    1:2:boolean isRepackagingEnabled():555:556 -> V
+    1:3:boolean isShrinking():532:532 -> W
+    5:5:boolean isShrinking():534:534 -> W
+    1:1:boolean isStringSwitchConversionEnabled():1492:1492 -> X
+    1:2:boolean keepInnerClassStructure():584:585 -> Y
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():631:631 -> Z
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
-    1:2:void setMarker(com.android.tools.r8.dex.Marker):340:341 -> a
-    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):345:346 -> a
-    5:11:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):353:359 -> a
-    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):348 -> a
-    12:12:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    12:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):360 -> a
-    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):348 -> a
-    13:28:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):360:375 -> a
-    13:28:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):348 -> a
-    29:29:boolean assertionsEnabled():798:798 -> a
-    30:30:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):814:814 -> a
-    31:31:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> a
-    32:38:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):930:936 -> a
-    39:39:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):931:931 -> a
-    40:41:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):943:944 -> a
-    42:42:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> a
-    42:42:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):946 -> a
-    43:49:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):946:952 -> a
-    50:50:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):944:944 -> a
-    51:58:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):962:969 -> a
-    59:59:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):963:963 -> a
-    60:60:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexEncodedMethod):969:969 -> a
-    61:64:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):974:977 -> a
-    65:69:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):982:986 -> a
-    70:76:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):991:997 -> a
-    77:77:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):992:992 -> a
-    78:78:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):996:996 -> a
-    79:79:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1389:1389 -> a
-    80:80:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1409:1409 -> a
-    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
-    81:81:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1409 -> a
-    82:83:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1409:1410 -> a
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():625:625 -> a0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():621:621 -> b
-    2:4:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):870:872 -> b
-    5:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):886:891 -> b
-    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> b
-    11:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):891 -> b
-    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):893:893 -> b
+    1:2:void setMarker(com.android.tools.r8.dex.Marker):341:342 -> a
+    3:4:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):346:347 -> a
+    5:11:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):354:360 -> a
+    5:11:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):349 -> a
+    12:12:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    12:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):361 -> a
+    12:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):349 -> a
+    13:28:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):361:376 -> a
+    13:28:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):349 -> a
+    29:29:boolean assertionsEnabled():804:804 -> a
+    30:30:void errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):820:820 -> a
+    31:31:void errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):842:842 -> a
+    32:38:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):936:942 -> a
+    39:39:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):937:937 -> a
+    40:41:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):949:950 -> a
+    42:42:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> a
+    42:42:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):952 -> a
+    43:49:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):952:958 -> a
+    50:50:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):950:950 -> a
+    51:58:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):968:975 -> a
+    59:59:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,java.util.Set):969:969 -> a
+    60:60:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexEncodedMethod):975:975 -> a
+    61:64:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):980:983 -> a
+    65:69:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):988:992 -> a
+    70:76:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):997:1003 -> a
+    77:77:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):998:998 -> a
+    78:78:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1002:1002 -> a
+    79:79:boolean hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1407:1407 -> a
+    80:80:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1427:1427 -> a
+    81:81:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
+    81:81:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1427 -> a
+    82:83:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1427:1428 -> a
+    1:32:boolean printWarnings():1034:1065 -> a0
+    33:72:boolean printWarnings():1061:1100 -> a0
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():623:623 -> b
+    2:4:java.lang.String messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):876:878 -> b
+    5:10:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):892:897 -> b
+    11:11:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> b
+    11:11:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):897 -> b
+    12:12:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):899:899 -> b
     13:13:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> b
-    13:13:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):894 -> b
-    14:18:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):895:899 -> b
+    13:13:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):900 -> b
+    14:18:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):901:905 -> b
     19:19:boolean com.android.tools.r8.graph.DexClass.isClasspathClass():0:0 -> b
-    19:19:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):899 -> b
-    20:41:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):899:920 -> b
-    42:42:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):985:985 -> b
-    43:48:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1108:1113 -> b
-    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1414:1414 -> b0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> b0
-    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1414 -> b0
-    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1414:1415 -> b0
-    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):852:852 -> c
-    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> c
-    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):853 -> c
-    3:3:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):854:854 -> c
+    19:19:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):905 -> b
+    20:41:java.lang.String messageErrorIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):905:926 -> b
+    42:42:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):991:991 -> b
+    43:48:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1114:1119 -> b
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():627:627 -> b0
+    1:1:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):858:858 -> c
+    2:2:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> c
+    2:2:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):859 -> c
+    3:3:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):860:860 -> c
     4:4:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> c
-    4:4:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):856 -> c
-    5:5:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> c
-    5:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):857 -> c
-    6:7:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):861:862 -> c
-    8:8:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> c
-    8:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):864 -> c
-    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):864:864 -> c
-    10:10:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):924:924 -> c
-    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):866 -> c
-    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):866:866 -> c
-    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):862:862 -> c
-    13:15:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):879:881 -> c
-    16:16:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):976:976 -> c
-    17:17:boolean canHaveArtCheckCastVerifierBug():1799:1799 -> c
-    1:1:boolean shouldBackportMethods():405:405 -> c0
+    4:4:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):862 -> c
+    5:5:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):842:842 -> c
+    5:5:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):863 -> c
+    6:7:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):867:868 -> c
+    8:8:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> c
+    8:8:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):870 -> c
+    9:9:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):870:870 -> c
+    10:10:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):930:930 -> c
+    10:10:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):872 -> c
+    11:11:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):872:872 -> c
+    12:12:void nestDesugaringWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):868:868 -> c
+    13:15:java.lang.String messageWarningMissingNestHost(com.android.tools.r8.graph.DexClass):885:887 -> c
+    16:16:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):982:982 -> c
+    17:17:boolean canHaveArtCheckCastVerifierBug():1817:1817 -> c
+    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1432:1432 -> c0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> c0
+    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1432 -> c0
+    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1432:1433 -> c0
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> d
-    1:1:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):825 -> d
-    2:2:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):828:828 -> d
-    3:3:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> d
-    3:3:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):830 -> d
-    4:6:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):830:832 -> d
-    7:7:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):828:828 -> d
-    8:8:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):814:814 -> d
-    8:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):826 -> d
-    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):840:840 -> d
-    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> d
-    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):841 -> d
+    1:1:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):831 -> d
+    2:2:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):834:834 -> d
+    3:3:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> d
+    3:3:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):836 -> d
+    4:6:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):836:838 -> d
+    7:7:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):834:834 -> d
+    8:8:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):820:820 -> d
+    8:8:void nestDesugaringWarningMissingNestHost(com.android.tools.r8.graph.DexClass):832 -> d
+    9:9:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):846:846 -> d
+    10:10:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> d
+    10:10:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847 -> d
     11:11:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> d
-    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):842 -> d
-    12:12:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):836:836 -> d
-    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):843 -> d
-    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847:847 -> d
-    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):924:924 -> d
-    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847 -> d
-    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):847:847 -> d
-    16:17:boolean canHaveArtInstanceOfVerifierBug():1754:1755 -> d
-    1:4:boolean shouldDesugarNests():474:477 -> d0
+    11:11:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):848 -> d
+    12:12:void com.android.tools.r8.utils.InternalOptions.errorMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):842:842 -> d
+    12:12:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):849 -> d
+    13:13:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):853:853 -> d
+    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageWarningIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):930:930 -> d
+    14:14:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):853 -> d
+    15:15:void warningMissingClassIncompleteNest(java.util.List,com.android.tools.r8.graph.AppView):853:853 -> d
+    16:17:boolean canHaveArtInstanceOfVerifierBug():1772:1773 -> d
+    1:1:boolean shouldBackportMethods():406:406 -> d0
     1:1:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> e
-    1:1:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):818 -> e
-    2:2:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):821:821 -> e
-    3:3:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):814:814 -> e
-    3:3:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):819 -> e
-    4:4:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1831:1831 -> e
-    1:1:boolean shouldKeepStackMapTable():409:409 -> e0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():401:401 -> e0
-    2:2:boolean shouldKeepStackMapTable():409 -> e0
-    3:4:boolean shouldKeepStackMapTable():409:410 -> e0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():401:401 -> e0
-    5:5:boolean shouldKeepStackMapTable():411 -> e0
-    6:6:boolean shouldKeepStackMapTable():412:412 -> e0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> f
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1823 -> f
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():1823:1823 -> f
-    1:1:boolean shouldRerunEnqueuer():416:416 -> f0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> g
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1845 -> g
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1845:1845 -> g
-    1:18:void signalFinishedToConsumers():452:469 -> g0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> h
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1501 -> h
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1501:1501 -> h
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1447:1447 -> i
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> j
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1491 -> j
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1491:1491 -> j
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> k
-    1:1:boolean canUseConstantMethodHandle():1427 -> k
-    2:2:boolean canUseConstantMethodHandle():1427:1427 -> k
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> l
-    1:1:boolean canUseConstantMethodType():1431 -> l
-    2:2:boolean canUseConstantMethodType():1431:1431 -> l
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1439:1439 -> m
-    1:2:boolean canUseFilledNewArrayOfObjects():1513:1514 -> n
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> o
-    1:1:boolean canUseInvokeCustom():1435 -> o
-    2:2:boolean canUseInvokeCustom():1435:1435 -> o
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> p
-    1:1:boolean canUseInvokePolymorphic():1423 -> p
-    2:2:boolean canUseInvokePolymorphic():1423:1423 -> p
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> q
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1419 -> q
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1419:1419 -> q
-    1:2:boolean canUseMultidex():1478:1479 -> r
-    1:1:boolean canUseNestBasedAccess():1443:1443 -> s
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> t
-    1:1:boolean canUseNotInstruction():1549 -> t
-    2:2:boolean canUseNotInstruction():1549:1549 -> t
-    1:1:boolean canUsePrivateInterfaceMethods():1455:1455 -> u
-    1:1:boolean canUseRequireNonNull():1483:1483 -> v
-    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1522:1523 -> w
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> x
-    1:1:boolean canUseSuppressedExceptions():1487 -> x
-    2:2:boolean canUseSuppressedExceptions():1487:1487 -> x
-    1:1:boolean canUseTwrCloseResourceMethod():1451:1451 -> y
-    1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():117:117 -> z
-com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.eg$a:
+    1:1:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):824 -> e
+    2:2:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):827:827 -> e
+    3:3:void com.android.tools.r8.utils.InternalOptions.errorMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):820:820 -> e
+    3:3:void warningMissingClassMissingNestHost(com.android.tools.r8.graph.DexClass):825 -> e
+    4:4:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():1849:1849 -> e
+    1:4:boolean shouldDesugarNests():475:478 -> e0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> f
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():1841 -> f
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():1841:1841 -> f
+    1:1:boolean shouldKeepStackMapTable():410:410 -> f0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():402:402 -> f0
+    2:2:boolean shouldKeepStackMapTable():410 -> f0
+    3:4:boolean shouldKeepStackMapTable():410:411 -> f0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():402:402 -> f0
+    5:5:boolean shouldKeepStackMapTable():412 -> f0
+    6:6:boolean shouldKeepStackMapTable():413:413 -> f0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> g
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1863 -> g
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():1863:1863 -> g
+    1:1:boolean shouldRerunEnqueuer():417:417 -> g0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> h
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1519 -> h
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1519:1519 -> h
+    1:18:void signalFinishedToConsumers():453:470 -> h0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1465:1465 -> i
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> j
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1509 -> j
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1509:1509 -> j
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> k
+    1:1:boolean canUseConstantMethodHandle():1445 -> k
+    2:2:boolean canUseConstantMethodHandle():1445:1445 -> k
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> l
+    1:1:boolean canUseConstantMethodType():1449 -> l
+    2:2:boolean canUseConstantMethodType():1449:1449 -> l
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1457:1457 -> m
+    1:2:boolean canUseFilledNewArrayOfObjects():1531:1532 -> n
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> o
+    1:1:boolean canUseInvokeCustom():1453 -> o
+    2:2:boolean canUseInvokeCustom():1453:1453 -> o
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> p
+    1:1:boolean canUseInvokePolymorphic():1441 -> p
+    2:2:boolean canUseInvokePolymorphic():1441:1441 -> p
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> q
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1437 -> q
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1437:1437 -> q
+    1:2:boolean canUseMultidex():1496:1497 -> r
+    1:1:boolean canUseNestBasedAccess():1461:1461 -> s
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> t
+    1:1:boolean canUseNotInstruction():1567 -> t
+    2:2:boolean canUseNotInstruction():1567:1567 -> t
+    1:1:boolean canUsePrivateInterfaceMethods():1473:1473 -> u
+    1:1:boolean canUseRequireNonNull():1501:1501 -> v
+    1:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1540:1541 -> w
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> x
+    1:1:boolean canUseSuppressedExceptions():1505 -> x
+    2:2:boolean canUseSuppressedExceptions():1505:1505 -> x
+    1:1:boolean canUseTwrCloseResourceMethod():1469:1469 -> y
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():635:635 -> z
+com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.rg$a:
     boolean $assertionsDisabled -> a
     boolean enableConstantPropagation -> b
     boolean enableTypePropagation -> c
-    1:1:void <clinit>():1167:1167 -> <clinit>
-    1:11:void <init>():1167:1177 -> <init>
-    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1180:1181 -> a
-    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1167 -> a
-    3:3:void disableTypePropagationForTesting():1185:1185 -> a
-    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1191:1192 -> a
-    1:1:boolean isConstantPropagationEnabled():1204:1204 -> b
-    1:1:boolean isEnabled():1200:1200 -> c
-    1:1:boolean isTypePropagationEnabled():1208:1208 -> d
-com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.eg$b:
+    1:1:void <clinit>():1181:1181 -> <clinit>
+    1:11:void <init>():1181:1191 -> <init>
+    1:2:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1194:1195 -> a
+    1:2:void access$000(com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions):1181 -> a
+    3:3:void disableTypePropagationForTesting():1199:1199 -> a
+    4:5:void enableConstantPropagationForTesting(com.android.tools.r8.utils.InternalOptions):1205:1206 -> a
+    1:1:boolean isConstantPropagationEnabled():1218:1218 -> b
+    1:1:boolean isEnabled():1214:1214 -> c
+    1:1:boolean isTypePropagationEnabled():1222:1222 -> d
+com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.rg$b:
+    boolean sortMethodsOnCfOutput -> a
+    1:4:void <init>():1175:1178 -> <init>
+com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.rg$c:
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> a
     1:2:void <clinit>():104:105 -> <clinit>
     1:1:void <init>(java.lang.String,int):103:103 -> <init>
-com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.eg$c:
+com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.rg$d:
     int expectedParameterCount -> b
     int actualParameterCount -> c
     com.android.tools.r8.graph.DexMethod method -> a
-    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):715:718 -> <init>
-com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.eg$d:
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):721:724 -> <init>
+com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.rg$e:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1162:1164 -> <init>
-com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.eg$e:
+    1:3:void <init>():1168:1170 -> <init>
+com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.rg$f:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> a
     1:2:void <clinit>():99:100 -> <clinit>
     1:1:void <init>(java.lang.String,int):98:98 -> <init>
-com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.eg$f:
+com.android.tools.r8.utils.InternalOptions$OutlineOptions -> com.android.tools.r8.internal.rg$g:
     int threshold -> d
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:9:void <init>():1151:1159 -> <init>
-com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.eg$g:
+    1:9:void <init>():1157:1165 -> <init>
+com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.rg$h:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> b
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> a
-    1:5:void <clinit>():1128:1132 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1126:1126 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1135:1135 -> a
-    1:1:boolean isSome():1147 -> a
-com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.eg$h:
+    1:5:void <clinit>():1134:1138 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1132:1132 -> <init>
+    1:1:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1141:1141 -> a
+    1:1:boolean isSome():1153 -> a
+com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.rg$i:
+    boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:6:void <init>():1212:1217 -> <init>
-    1:1:boolean isProtoShrinkingEnabled():1221:1221 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.eg$i:
+    1:7:void <init>():1226:1232 -> <init>
+    1:1:boolean isProtoEnumShrinkingEnabled():1242:1242 -> a
+    1:1:boolean isProtoShrinkingEnabled():1235:1235 -> b
+com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.rg$j:
     boolean allowCheckDiscardedErrors -> m
     java.util.function.BiConsumer unboxedEnumsConsumer -> i
     boolean assertConsistentRenamingOfSignature -> P
@@ -78394,23 +78981,23 @@
     java.util.function.Consumer waveModifier -> k
     boolean placeExceptionalBlocksLast -> B
     java.util.function.Consumer callSiteOptimizationInfoInspector -> g0
-    1:151:void <init>():1228:1378 -> <init>
+    1:151:void <init>():1246:1396 -> <init>
     void lambda$new$1(java.util.Deque) -> a
-    1:2:com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration lambda$new$0(com.android.tools.r8.graph.AppView):1250:1251 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.eg$i$a:
+    1:2:com.android.tools.r8.repackaging.Repackaging$RepackagingConfiguration lambda$new$0(com.android.tools.r8.graph.AppView):1268:1269 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.rg$j$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1352:1354 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1358:1359 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1360:1360 -> a
-com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.eg$i$b:
+    1:3:void <init>():1370:1372 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1376:1377 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1378:1378 -> a
+com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.rg$j$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1370:1373 -> <init>
-com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.eg$j:
+    1:4:void <init>():1388:1391 -> <init>
+com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.rg$k:
     com.android.tools.r8.cf.CfVersion version -> a
     com.android.tools.r8.graph.DexType type -> b
-    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):727:729 -> <init>
-com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.fg:
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):733:735 -> <init>
+com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.sg:
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> a
     com.android.tools.r8.utils.InternalOutputMode DexFilePerClassFile -> b
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> c
@@ -78418,7 +79005,7 @@
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean isGeneratingClassFiles():13:13 -> a
     1:1:boolean isGeneratingDex():17:17 -> b
-com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.Dg:
+com.android.tools.r8.utils.IterableUtils -> com.android.tools.r8.internal.Qg:
     1:1:java.lang.Iterable filter(java.lang.Iterable,java.util.function.Predicate):39:39 -> a
     2:2:int size(java.lang.Iterable):44:44 -> a
     3:3:java.util.Iterator lambda$singleton$1(java.lang.Object):61:61 -> a
@@ -78430,15 +79017,16 @@
     1:1:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):39:39 -> c
     2:23:java.util.Iterator com.android.tools.r8.utils.IteratorUtils.filter(java.util.Iterator,java.util.function.Predicate):0:21 -> c
     2:23:java.util.Iterator lambda$filter$0(java.lang.Iterable,java.util.function.Predicate):39 -> c
-com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Ig:
+com.android.tools.r8.utils.IteratorUtils -> com.android.tools.r8.internal.Vg:
     boolean $assertionsDisabled -> a
+    int $r8$clinit -> b
     1:1:void <clinit>():17:17 -> <clinit>
     1:1:java.util.Iterator filter(java.util.Iterator,java.util.function.Predicate):21:21 -> a
-    2:5:java.lang.Object peekNext(java.util.ListIterator):61:64 -> a
-    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):104:116 -> a
-    1:3:java.lang.Object peekPrevious(java.util.ListIterator):54:56 -> b
-    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):81:84 -> b
-com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Hg:
+    2:5:java.lang.Object peekNext(java.util.ListIterator):71:74 -> a
+    6:18:boolean anyRemainingMatch(java.util.ListIterator,java.util.function.Predicate):114:126 -> a
+    1:3:java.lang.Object peekPrevious(java.util.ListIterator):64:66 -> b
+    4:7:void removeIf(java.util.Iterator,java.util.function.Predicate):91:94 -> b
+com.android.tools.r8.utils.IteratorUtils$1 -> com.android.tools.r8.internal.Ug:
     java.util.Iterator val$iterator -> b
     java.util.function.Predicate val$predicate -> c
     java.lang.Object next -> a
@@ -78447,7 +79035,7 @@
     1:3:java.lang.Object advance():27:29 -> l
     1:5:java.lang.Object next():43:47 -> next
     6:6:java.lang.Object next():45:45 -> next
-com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.kl:
+com.android.tools.r8.utils.LRUCacheTable -> com.android.tools.r8.internal.xl:
     int columnCapacity -> b
     int rowCapacity -> a
     1:3:void <init>(int,int,float):31:33 -> <init>
@@ -78455,15 +79043,15 @@
     2:3:java.lang.Object put(java.lang.Object,java.lang.Object,java.lang.Object):46:47 -> a
     1:1:com.android.tools.r8.utils.LRUCacheTable create(int,int):37:37 -> b
     1:1:boolean removeEldestEntry(java.util.Map$Entry):42:42 -> removeEldestEntry
-com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.jl:
+com.android.tools.r8.utils.LRUCacheTable$LRUCacheRow -> com.android.tools.r8.internal.wl:
     int columnCapacity -> a
     1:2:void <init>(int,float):17:18 -> <init>
     1:1:boolean removeEldestEntry(java.util.Map$Entry):23:23 -> removeEldestEntry
-com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.Tl:
+com.android.tools.r8.utils.LazyBox -> com.android.tools.r8.internal.gm:
     java.util.function.Supplier supplier -> b
     1:2:void <init>(java.util.function.Supplier):13:14 -> <init>
     1:1:java.lang.Object computeIfAbsent():18:18 -> c
-com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.bm:
+com.android.tools.r8.utils.LebUtils -> com.android.tools.r8.internal.om:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:6:int parseSleb128(com.android.tools.r8.dex.BinaryReader):65:70 -> a
@@ -78474,7 +79062,7 @@
     17:21:void putUleb128(com.android.tools.r8.dex.DexOutputBuffer,int):48:52 -> b
     1:1:int sizeAsSleb128(int):110:110 -> c
     1:1:int sizeAsUleb128(int):57:57 -> d
-com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.dm:
+com.android.tools.r8.utils.LibraryClassCollection -> com.android.tools.r8.internal.qm:
     1:1:void <init>(com.android.tools.r8.utils.ClassProvider):15:15 -> <init>
     1:1:java.util.function.Supplier getTransparentSupplier(com.android.tools.r8.graph.DexClass):13:13 -> a
     2:2:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13:13 -> a
@@ -78484,7 +79072,7 @@
     6:6:com.android.tools.r8.graph.DexClass resolveClassConflict(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):13 -> a
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():34:34 -> c
     1:1:java.lang.String toString():39:39 -> toString
-com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.xm:
+com.android.tools.r8.utils.LineNumberOptimizer -> com.android.tools.r8.internal.Km:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():63:63 -> <clinit>
     1:1:void access$1200(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):63:63 -> a
@@ -78496,7 +79084,7 @@
     33:51:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):306:324 -> a
     52:52:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):456:456 -> a
     52:52:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
-    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():432:432 -> a
+    53:53:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():433:433 -> a
     53:53:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):456 -> a
     53:53:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
     54:65:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):459:470 -> a
@@ -78504,7 +79092,7 @@
     66:66:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):0:0 -> a
     66:66:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):470 -> a
     66:66:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
-    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():549:549 -> a
+    67:67:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():550:550 -> a
     67:67:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):154 -> a
     67:67:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):470 -> a
     67:67:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
@@ -78514,7 +79102,7 @@
     69:84:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):474:489 -> a
     69:84:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):324 -> a
     85:104:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):328:347 -> a
-    105:105:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1460:1460 -> a
+    105:105:boolean com.android.tools.r8.utils.InternalOptions.canUseDexPcAsDebugInformation():1478:1478 -> a
     105:105:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):347 -> a
     106:106:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens):347:347 -> a
     107:110:void com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositionsForPc(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):731:734 -> a
@@ -78548,7 +79136,7 @@
     392:405:int getMethodStartLine(com.android.tools.r8.graph.DexEncodedMethod):495:508 -> a
     406:406:void sortMethods(java.util.List):517:517 -> a
     407:408:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):519:520 -> a
-    409:409:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1407:1407 -> a
+    409:409:int com.android.tools.r8.graph.DexEncodedMethod.slowCompare(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):1420:1420 -> a
     409:409:int lambda$sortMethods$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):523 -> a
     410:410:void addFieldsToClassNaming(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexType,java.util.function.Supplier):545:545 -> a
     411:418:void lambda$addFieldsToClassNaming$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.graph.DexType,java.util.function.Supplier,com.android.tools.r8.graph.DexEncodedField):547:554 -> a
@@ -78561,7 +79149,7 @@
     445:447:boolean doesContainPositions(com.android.tools.r8.graph.CfCode):605:607 -> a
     1:4:com.android.tools.r8.ir.code.Position remapAndAdd(com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):822:825 -> b
     5:8:void remapAndAddForPc(int,int,com.android.tools.r8.ir.code.Position,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,java.util.List):837:840 -> b
-com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.pm:
+com.android.tools.r8.utils.LineNumberOptimizer$1 -> com.android.tools.r8.internal.Cm:
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> j
     com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter val$positionEventEmitter -> i
     com.android.tools.r8.utils.Box val$inlinedOriginalPosition -> l
@@ -78579,7 +79167,7 @@
     20:21:void visit(com.android.tools.r8.graph.DexDebugEvent$EndLocal):698:699 -> a
     22:23:void visit(com.android.tools.r8.graph.DexDebugEvent$RestartLocal):704:705 -> a
     1:3:void flushPc():644:646 -> f
-com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.qm:
+com.android.tools.r8.utils.LineNumberOptimizer$2 -> com.android.tools.r8.internal.Dm:
     com.android.tools.r8.utils.Pair val$lastPosition -> h
     com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper val$positionRemapper -> i
     java.util.List val$mappedPositions -> j
@@ -78589,11 +79177,11 @@
     1:7:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):740:746 -> a
     8:21:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):743:756 -> a
     22:22:void visit(com.android.tools.r8.graph.DexDebugEvent$Default):751:751 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.rm:
+com.android.tools.r8.utils.LineNumberOptimizer$IdentityPositionRemapper -> com.android.tools.r8.internal.Em:
     1:1:void <init>():71:71 -> <init>
     2:2:void <init>(com.android.tools.r8.utils.LineNumberOptimizer$1):71:71 -> <init>
     1:1:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):75:75 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.sm:
+com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper -> com.android.tools.r8.internal.Fm:
     com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result parsedData -> h
     com.android.tools.r8.graph.DexItemFactory factory -> c
     java.util.Map parsedKotlinSourceDebugExtensions -> d
@@ -78610,7 +79198,7 @@
     2:4:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):136:138 -> a
     5:11:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):184:190 -> a
     5:11:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):138 -> a
-    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):258:258 -> a
+    12:12:com.android.tools.r8.graph.DexClass com.android.tools.r8.graph.AppView.definitionFor(com.android.tools.r8.graph.DexType):259:259 -> a
     12:12:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):190 -> a
     12:12:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):138 -> a
     13:18:com.android.tools.r8.kotlin.KotlinSourceDebugExtensionParser$Result com.android.tools.r8.utils.LineNumberOptimizer$KotlinInlineFunctionPositionRemapper.getAndParseSourceDebugExtension(com.android.tools.r8.graph.DexType):191:196 -> a
@@ -78624,7 +79212,7 @@
     40:42:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):158 -> a
     43:53:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):159:169 -> a
     54:68:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):166:180 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.tm:
+com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition -> com.android.tools.r8.internal.Gm:
     int obfuscatedLine -> d
     int originalLine -> b
     com.android.tools.r8.ir.code.Position caller -> c
@@ -78635,7 +79223,7 @@
     1:1:int access$400(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):251:251 -> b
     1:1:com.android.tools.r8.graph.DexMethod access$500(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):251:251 -> c
     1:1:com.android.tools.r8.ir.code.Position access$600(com.android.tools.r8.utils.LineNumberOptimizer$MappedPosition):251:251 -> d
-com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.um:
+com.android.tools.r8.utils.LineNumberOptimizer$OptimizingPositionRemapper -> com.android.tools.r8.internal.Hm:
     int previousSourceLine -> d
     int nextOptimizedLineNumber -> e
     boolean $assertionsDisabled -> a
@@ -78645,7 +79233,7 @@
     1:1:void <init>(com.android.tools.r8.utils.InternalOptions):85:85 -> <init>
     2:10:void <init>(com.android.tools.r8.utils.InternalOptions):81:89 -> <init>
     1:15:com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position):94:108 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.vm:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter -> com.android.tools.r8.internal.Im:
     com.android.tools.r8.graph.DexItemFactory dexItemFactory -> b
     com.android.tools.r8.graph.DexMethod method -> d
     int previousPc -> e
@@ -78663,14 +79251,14 @@
     3:16:void access$1000(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter,int,com.android.tools.r8.ir.code.Position):207 -> a
     17:18:int com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter.getStartLine():245:246 -> a
     17:18:int access$1100(com.android.tools.r8.utils.LineNumberOptimizer$PositionEventEmitter):207 -> a
-com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.wm:
+com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper -> com.android.tools.r8.internal.Jm:
     com.android.tools.r8.utils.Pair createRemappedPosition(com.android.tools.r8.ir.code.Position) -> a
-com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.Fm:
+com.android.tools.r8.utils.ListUtils -> com.android.tools.r8.internal.Sm:
     1:1:java.lang.Object first(java.util.List):17:17 -> a
     2:3:int lastIndexMatching(java.util.List,java.util.function.Predicate):34:35 -> a
     4:6:java.util.List map(java.util.Collection,java.util.function.Function):43:45 -> a
     1:1:java.lang.Object last(java.util.List):30:30 -> b
-com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.hn:
+com.android.tools.r8.utils.LongInterval -> com.android.tools.r8.internal.tn:
     long min -> b
     long max -> c
     boolean $assertionsDisabled -> a
@@ -78686,7 +79274,7 @@
     1:2:boolean equals(java.lang.Object):66:67 -> equals
     1:1:int hashCode():58:58 -> hashCode
     1:1:java.lang.String toString():74:74 -> toString
-com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.xn:
+com.android.tools.r8.utils.MainDexListParser -> com.android.tools.r8.internal.Jn:
     1:9:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):21:29 -> a
     10:10:com.android.tools.r8.graph.DexType parseEntry(java.lang.String,com.android.tools.r8.graph.DexItemFactory):26:26 -> a
     11:11:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String):22:22 -> a
@@ -78701,7 +79289,7 @@
     36:36:void com.android.tools.r8.errors.CompilationError.<init>(java.lang.String,java.lang.Throwable,com.android.tools.r8.origin.Origin):38:38 -> a
     36:36:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory):37 -> a
     37:37:java.util.Set parseList(com.android.tools.r8.StringResource,com.android.tools.r8.graph.DexItemFactory) -> a
-com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.Ao:
+com.android.tools.r8.utils.MethodJavaSignatureEquivalence -> com.android.tools.r8.internal.Mo:
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE -> a
     com.android.tools.r8.utils.MethodJavaSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     boolean ignoreName -> c
@@ -78715,7 +79303,7 @@
     7:10:int doHash(java.lang.Object):15 -> a
     11:11:com.android.tools.r8.utils.MethodJavaSignatureEquivalence get():30:30 -> a
     1:1:com.android.tools.r8.utils.MethodJavaSignatureEquivalence getEquivalenceIgnoreName():34:34 -> b
-com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.Jo:
+com.android.tools.r8.utils.MethodSignatureEquivalence -> com.android.tools.r8.internal.Vo:
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE_IGNORE_NAME -> b
     com.android.tools.r8.utils.MethodSignatureEquivalence INSTANCE -> a
     boolean ignoreName -> c
@@ -78729,7 +79317,7 @@
     7:10:int doHash(java.lang.Object):14 -> a
     11:11:com.android.tools.r8.utils.MethodSignatureEquivalence get():28:28 -> a
     1:1:com.android.tools.r8.utils.MethodSignatureEquivalence getEquivalenceIgnoreName():32:32 -> b
-com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.Gr:
+com.android.tools.r8.utils.OffOrAuto -> com.android.tools.r8.internal.Sr:
     com.android.tools.r8.utils.OffOrAuto Auto -> b
     com.android.tools.r8.utils.OffOrAuto Off -> a
     com.android.tools.r8.utils.OffOrAuto[] $VALUES -> c
@@ -78750,7 +79338,7 @@
     1:1:java.util.Set getClassDescriptors():59:59 -> getClassDescriptors
     1:1:com.android.tools.r8.ProgramResource$Kind getKind():41:41 -> getKind
     1:1:com.android.tools.r8.origin.Origin getOrigin():36:36 -> getOrigin
-com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.Or:
+com.android.tools.r8.utils.OptionalBool -> com.android.tools.r8.internal.as:
     com.android.tools.r8.utils.OptionalBool UNKNOWN -> e
     com.android.tools.r8.utils.OptionalBool TRUE -> c
     com.android.tools.r8.utils.OptionalBool FALSE -> d
@@ -78759,15 +79347,15 @@
     com.android.tools.r8.utils.OptionalBool asOptionalBool() -> a
     1:1:com.android.tools.r8.utils.OptionalBool of(boolean):54:54 -> a
     1:1:int hashCode():73:73 -> hashCode
-com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.Or$a:
+com.android.tools.r8.utils.OptionalBool$1 -> com.android.tools.r8.internal.as$a:
     1:1:void <init>():10:10 -> <init>
     boolean isTrue() -> f
-com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.Or$b:
+com.android.tools.r8.utils.OptionalBool$2 -> com.android.tools.r8.internal.as$b:
     1:1:void <init>():24:24 -> <init>
     boolean isFalse() -> c
-com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.Or$c:
+com.android.tools.r8.utils.OptionalBool$3 -> com.android.tools.r8.internal.as$c:
     1:1:void <init>():38:38 -> <init>
-com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.Pr:
+com.android.tools.r8.utils.OptionsParsing -> com.android.tools.r8.internal.bs:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():10:10 -> <clinit>
     1:13:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):37:49 -> a
@@ -78775,14 +79363,14 @@
     19:19:java.lang.String tryParseSingle(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String,java.lang.String):41:41 -> a
     20:27:java.lang.Boolean tryParseBoolean(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):60:67 -> a
     1:11:java.util.List tryParseMulti(com.android.tools.r8.utils.OptionsParsing$ParseContext,java.lang.String):18:28 -> b
-com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.Pr$a:
+com.android.tools.r8.utils.OptionsParsing$ParseContext -> com.android.tools.r8.internal.bs$a:
     java.lang.String[] args -> a
     int nextIndex -> b
     1:1:void <init>(java.lang.String[]):76:76 -> <init>
     2:5:void <init>(java.lang.String[]):74:77 -> <init>
     1:1:java.lang.String head():81:81 -> a
     1:5:java.lang.String next():85:89 -> b
-com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.Sr:
+com.android.tools.r8.utils.OriginWithPosition -> com.android.tools.r8.internal.es:
     com.android.tools.r8.origin.Origin origin -> a
     com.android.tools.r8.position.Position position -> b
     1:3:void <init>(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position):14:16 -> <init>
@@ -78790,14 +79378,14 @@
     1:1:com.android.tools.r8.position.Position getPosition():24:24 -> b
     1:3:boolean equals(java.lang.Object):34:36 -> equals
     1:1:int hashCode():29:29 -> hashCode
-com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.fs:
+com.android.tools.r8.utils.OutputBuilder -> com.android.tools.r8.internal.rs:
     void addDirectory(java.lang.String,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void addFile(java.lang.String,com.android.tools.r8.DataEntryResource,com.android.tools.r8.DiagnosticsHandler) -> a
     void addIndexedClassFile(int,java.lang.String,com.android.tools.r8.ByteDataView,com.android.tools.r8.DiagnosticsHandler) -> a
     void close(com.android.tools.r8.DiagnosticsHandler) -> a
     java.nio.file.Path getPath() -> a
-com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.ls:
+com.android.tools.r8.utils.Pair -> com.android.tools.r8.internal.xs:
     java.lang.Object second -> b
     java.lang.Object first -> a
     1:3:void <init>(java.lang.Object,java.lang.Object):23:25 -> <init>
@@ -78807,7 +79395,7 @@
     2:2:void setSecond(java.lang.Object):41:41 -> b
     1:1:boolean equals(java.lang.Object):51:51 -> equals
     1:1:int hashCode():46:46 -> hashCode
-com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Js:
+com.android.tools.r8.utils.PredicateSet -> com.android.tools.r8.internal.Vs:
     java.util.List predicates -> b
     java.util.Set elements -> a
     1:4:void <init>():14:17 -> <init>
@@ -78815,7 +79403,7 @@
     2:2:void addPredicate(java.util.function.Predicate):24:24 -> a
     3:9:com.android.tools.r8.utils.PredicateSet rewriteItems(java.util.function.Function):28:34 -> a
     1:5:boolean contains(java.lang.Object):39:43 -> b
-com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.Us:
+com.android.tools.r8.utils.PreloadedClassFileProvider -> com.android.tools.r8.internal.gt:
     java.util.Map content -> a
     1:1:void <init>(java.util.Map,com.android.tools.r8.utils.PreloadedClassFileProvider$1):19:19 -> <init>
     2:3:void <init>(java.util.Map):37:38 -> <init>
@@ -78834,8 +79422,8 @@
     1:6:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):48:53 -> getProgramResource
     7:7:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):52:52 -> getProgramResource
     1:1:java.lang.String toString():64:64 -> toString
-com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.Us$a:
-com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.Us$b:
+com.android.tools.r8.utils.PreloadedClassFileProvider$1 -> com.android.tools.r8.internal.gt$a:
+com.android.tools.r8.utils.PreloadedClassFileProvider$Builder -> com.android.tools.r8.internal.gt$b:
     java.util.Map content -> b
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():74:74 -> <clinit>
@@ -78844,11 +79432,11 @@
     3:3:void <init>():76:76 -> <init>
     1:5:com.android.tools.r8.utils.PreloadedClassFileProvider$Builder addResource(java.lang.String,byte[]):82:86 -> a
     6:8:com.android.tools.r8.utils.PreloadedClassFileProvider build():91:93 -> a
-com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.Us$c:
+com.android.tools.r8.utils.PreloadedClassFileProvider$ClassDescriptorOrigin -> com.android.tools.r8.internal.gt$c:
     java.lang.String descriptor -> e
     1:2:void <init>(java.lang.String):25:26 -> <init>
     1:1:java.lang.String part():31:31 -> part
-com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.ct:
+com.android.tools.r8.utils.ProgramClassCollection -> com.android.tools.r8.internal.xt:
     com.android.tools.r8.dex.ApplicationReader$ProgramClassConflictResolver conflictResolver -> e
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():18:18 -> <clinit>
@@ -78873,13 +79461,13 @@
     23:23:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):69 -> a
     24:24:com.android.tools.r8.graph.DexProgramClass lambda$defaultConflictResolver$1(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):71:71 -> a
     1:3:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:79 -> b
-    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():584:584 -> b
+    4:4:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():602:602 -> b
     4:4:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80 -> b
     5:5:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):80:80 -> b
     6:6:java.lang.RuntimeException reportDuplicateTypes(com.android.tools.r8.utils.Reporter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass):77:77 -> b
     1:1:com.android.tools.r8.graph.ClassKind getClassKind():57:57 -> c
     1:1:java.lang.String toString():42:42 -> toString
-com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.it:
+com.android.tools.r8.utils.ProgramMethodEquivalence -> com.android.tools.r8.internal.Dt:
     com.android.tools.r8.utils.ProgramMethodEquivalence INSTANCE -> a
     1:1:void <clinit>():12:12 -> <clinit>
     1:1:void <init>():14:14 -> <init>
@@ -78890,7 +79478,7 @@
     4:4:int com.android.tools.r8.utils.ProgramMethodEquivalence.doHash(com.android.tools.r8.graph.ProgramMethod):27:27 -> a
     4:4:int doHash(java.lang.Object):10 -> a
     5:5:com.android.tools.r8.utils.ProgramMethodEquivalence get():17:17 -> a
-com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.ax:
+com.android.tools.r8.utils.Reporter -> com.android.tools.r8.internal.tx:
     java.util.List diagnosticsLevelMapping -> b
     com.android.tools.r8.DiagnosticsHandler clientHandler -> a
     com.android.tools.r8.utils.AbortException abort -> c
@@ -78913,15 +79501,15 @@
     1:1:void error(com.android.tools.r8.Diagnostic):102:102 -> error
     1:1:void info(com.android.tools.r8.Diagnostic):84:84 -> info
     1:1:void warning(com.android.tools.r8.Diagnostic):93:93 -> warning
-com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.ax$a:
+com.android.tools.r8.utils.Reporter$1 -> com.android.tools.r8.internal.tx$a:
     1:1:void <init>():49:49 -> <init>
-com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.ax$b:
+com.android.tools.r8.utils.Reporter$DiagnosticsLevelMapping -> com.android.tools.r8.internal.tx$b:
     com.android.tools.r8.DiagnosticsLevel from -> a
     com.android.tools.r8.DiagnosticsLevel to -> b
     java.lang.String diagnosticsClassName -> c
     1:4:void <init>(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.DiagnosticsLevel,java.lang.String):25:28 -> <init>
     1:7:com.android.tools.r8.DiagnosticsLevel map(com.android.tools.r8.DiagnosticsLevel,com.android.tools.r8.Diagnostic):32:38 -> a
-com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.yx:
+com.android.tools.r8.utils.SegmentTree -> com.android.tools.r8.internal.Rx:
     java.util.TreeMap internalTree -> b
     int size -> d
     boolean $assertionsDisabled -> a
@@ -78934,7 +79522,7 @@
     5:44:com.android.tools.r8.utils.SegmentTree add(int,int,java.lang.Object):36:75 -> a
     45:48:boolean lambda$add$0(int,int,com.android.tools.r8.utils.Box,java.lang.Integer):43:46 -> a
     49:49:int size():80:80 -> a
-com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.zx:
+com.android.tools.r8.utils.SemanticVersion -> com.android.tools.r8.internal.Sx:
     int minor -> b
     int patch -> c
     int major -> a
@@ -78950,11 +79538,11 @@
     1:5:boolean equals(java.lang.Object):68:72 -> equals
     1:1:int hashCode():77:77 -> hashCode
     1:1:java.lang.String toString():82:82 -> toString
-com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.internal.gy:
+com.android.tools.r8.utils.SingletonEquivalence -> com.android.tools.r8.internal.zy:
     1:1:void <init>():11:11 -> <init>
     boolean doEquivalent(java.lang.Object,java.lang.Object) -> a
     int doHash(java.lang.Object) -> a
-com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.Ry:
+com.android.tools.r8.utils.StreamUtils -> com.android.tools.r8.internal.kz:
     1:2:byte[] StreamToByteArrayClose(java.io.InputStream):16:17 -> a
 com.android.tools.r8.utils.StringDiagnostic -> com.android.tools.r8.utils.StringDiagnostic:
     com.android.tools.r8.origin.Origin origin -> b
@@ -78968,7 +79556,7 @@
     1:1:java.lang.String getDiagnosticMessage():56:56 -> getDiagnosticMessage
     1:1:com.android.tools.r8.origin.Origin getOrigin():46:46 -> getOrigin
     1:1:com.android.tools.r8.position.Position getPosition():51:51 -> getPosition
-com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.rz:
+com.android.tools.r8.utils.StringUtils -> com.android.tools.r8.internal.Kz:
     char[] EMPTY_CHAR_ARRAY -> a
     java.lang.String LINE_SEPARATOR -> c
     java.lang.String[] EMPTY_ARRAY -> b
@@ -79006,7 +79594,7 @@
     1:9:java.lang.String toASCIIString(java.lang.String):53:61 -> c
     1:9:java.lang.String trim(java.lang.String):292:300 -> d
     1:5:java.lang.String withNativeLineSeparator(java.lang.String):159:163 -> e
-com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.rz$a:
+com.android.tools.r8.utils.StringUtils$BraceType -> com.android.tools.r8.internal.Kz$a:
     com.android.tools.r8.utils.StringUtils$BraceType SQUARE -> b
     com.android.tools.r8.utils.StringUtils$BraceType TUBORG -> c
     com.android.tools.r8.utils.StringUtils$BraceType PARENS -> a
@@ -79015,7 +79603,7 @@
     1:4:void <clinit>():26:29 -> <clinit>
     5:5:void <clinit>():25:25 -> <clinit>
     1:1:void <init>(java.lang.String,int):25:25 -> <init>
-com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.Oz:
+com.android.tools.r8.utils.SymbolGenerationUtils -> com.android.tools.r8.internal.hA:
     char[] IDENTIFIER_CHARACTERS -> b
     boolean $assertionsDisabled -> e
     java.util.Set PRIMITIVE_TYPE_NAMES -> a
@@ -79024,7 +79612,7 @@
     1:15:void <clinit>():13:27 -> <clinit>
     1:1:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing):31:31 -> a
     2:35:java.lang.String numberToIdentifier(int,com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing,char[],boolean):43:76 -> a
-com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.Oz$a:
+com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing -> com.android.tools.r8.internal.hA$a:
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing DONT_USE_MIXED_CASE -> b
     com.android.tools.r8.utils.SymbolGenerationUtils$MixedCasing USE_MIXED_CASE -> a
     1:2:void <clinit>():16:17 -> <clinit>
@@ -79061,32 +79649,34 @@
     2:2:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):159:159 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForThreads(int):166:166 -> b
     3:3:java.util.concurrent.ExecutorService getExecutorServiceForProcessors(int):160 -> b
-com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.oA:
-com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.pA:
-com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.qA:
+com.android.tools.r8.utils.ThrowingAction -> com.android.tools.r8.internal.GA:
+    void execute() -> a
+com.android.tools.r8.utils.ThrowingBiConsumer -> com.android.tools.r8.internal.HA:
+com.android.tools.r8.utils.ThrowingBiFunction -> com.android.tools.r8.internal.IA:
+com.android.tools.r8.utils.ThrowingCharIterator -> com.android.tools.r8.internal.JA:
     char nextChar() -> a
-com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.rA:
-com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.sA:
-com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.tA:
+com.android.tools.r8.utils.ThrowingConsumer -> com.android.tools.r8.internal.KA:
+com.android.tools.r8.utils.ThrowingFunction -> com.android.tools.r8.internal.LA:
+com.android.tools.r8.utils.ThrowingIntIterator -> com.android.tools.r8.internal.MA:
     1:1:void <init>():9:9 -> <init>
     boolean hasNext() -> a
     1:2:void forEachRemaining(java.util.function.IntConsumer):12:13 -> a
     3:6:int nextIntComputeIfAbsent(com.android.tools.r8.utils.ThrowingIntSupplier):22:25 -> a
     int nextInt() -> b
-com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.uA:
+com.android.tools.r8.utils.ThrowingIntSupplier -> com.android.tools.r8.internal.NA:
     int getAsInt() -> a
-com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.vA:
+com.android.tools.r8.utils.ThrowingIterator -> com.android.tools.r8.internal.OA:
     1:1:void <init>():11:11 -> <init>
     boolean hasNext() -> a
     1:4:java.lang.Object computeNextIfAbsent(com.android.tools.r8.utils.ThrowingSupplier):18:21 -> a
     5:10:java.util.List take(int):25:30 -> a
     11:11:java.util.List take(int):28:28 -> a
     java.lang.Object next() -> b
-com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.wA:
-com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.xA:
+com.android.tools.r8.utils.ThrowingReferenceIntConsumer -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.utils.ThrowingReferenceIntFunction -> com.android.tools.r8.internal.QA:
     java.lang.Object apply(java.lang.Object,int) -> a
-com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.yA:
-com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.AA:
+com.android.tools.r8.utils.ThrowingSupplier -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.utils.Timing -> com.android.tools.r8.internal.TA:
     java.util.Stack stack -> d
     com.android.tools.r8.utils.Timing EMPTY -> a
     com.android.tools.r8.utils.Timing$Node top -> c
@@ -79131,20 +79721,20 @@
     1:1:boolean access$800(com.android.tools.r8.utils.Timing):25:25 -> c
     2:3:void end():374:375 -> c
     1:6:void report():379:384 -> d
-com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.AA$a:
+com.android.tools.r8.utils.Timing$1 -> com.android.tools.r8.internal.TA$a:
     1:1:void <init>(java.lang.String,boolean):30:30 -> <init>
     void begin(java.lang.String) -> a
     1:1:com.android.tools.r8.utils.Timing$TimingMerger beginMerger(java.lang.String,int):33:33 -> a
     void end() -> c
     void report() -> d
-com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.zA:
+com.android.tools.r8.utils.Timing$1$1 -> com.android.tools.r8.internal.SA:
     1:1:void <init>(com.android.tools.r8.utils.Timing$1,java.lang.String,int,com.android.tools.r8.utils.Timing):33:33 -> <init>
     void add(java.util.Collection) -> a
     void end() -> a
-com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.AA$b:
+com.android.tools.r8.utils.Timing$MemInfo -> com.android.tools.r8.internal.TA$b:
     long used -> a
     1:2:void <init>(long):101:102 -> <init>
-com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.AA$c:
+com.android.tools.r8.utils.Timing$Node -> com.android.tools.r8.internal.TA$c:
     java.util.Map children -> d
     long start_time -> f
     long duration -> e
@@ -79207,7 +79797,7 @@
     4:4:java.lang.String com.android.tools.r8.utils.Timing.access$300(long):25 -> toString
     4:4:java.lang.String toString():156 -> toString
     5:5:java.lang.String toString():156:156 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.AA$d:
+com.android.tools.r8.utils.Timing$TimingMerger -> com.android.tools.r8.internal.TA$d:
     com.android.tools.r8.utils.Timing$Node merged -> c
     int taskCount -> d
     com.android.tools.r8.utils.Timing$Node slowest -> e
@@ -79223,7 +79813,7 @@
     24:24:com.android.tools.r8.utils.Timing$Node lambda$add$0(boolean,java.lang.String):305:305 -> a
     25:26:void end():315:316 -> a
     1:1:int access$900(com.android.tools.r8.utils.Timing$TimingMerger):225:225 -> b
-com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.BA:
+com.android.tools.r8.utils.Timing$TimingMerger$1 -> com.android.tools.r8.internal.UA:
     boolean $assertionsDisabled -> i
     int val$numberOfThreads -> j
     com.android.tools.r8.utils.Timing$TimingMerger this$0 -> k
@@ -79242,24 +79832,24 @@
     39:39:void lambda$report$0(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):259:259 -> a
     1:1:void lambda$report$1(int,java.lang.String,com.android.tools.r8.utils.Timing$Node):264:264 -> b
     1:1:java.lang.String toString():270:270 -> toString
-com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.CA:
+com.android.tools.r8.utils.Timing$TimingMerger$Item -> com.android.tools.r8.internal.VA:
     com.android.tools.r8.utils.Timing$Node mergeTarget -> a
     com.android.tools.r8.utils.Timing$Node mergeSource -> b
     1:3:void <init>(com.android.tools.r8.utils.Timing$Node,com.android.tools.r8.utils.Timing$Node):279:281 -> <init>
-com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.MA:
+com.android.tools.r8.utils.TraversalContinuation -> com.android.tools.r8.internal.fB:
     com.android.tools.r8.utils.TraversalContinuation CONTINUE -> a
     com.android.tools.r8.utils.TraversalContinuation BREAK -> b
     1:2:void <clinit>():8:9 -> <clinit>
     1:1:void <init>(java.lang.String,int):7:7 -> <init>
     1:1:boolean shouldBreak():12:12 -> a
     1:1:boolean shouldContinue():16:16 -> b
-com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.PA:
+com.android.tools.r8.utils.TriConsumer -> com.android.tools.r8.internal.jB:
     void accept(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.QA:
+com.android.tools.r8.utils.TriFunction -> com.android.tools.r8.internal.kB:
     java.lang.Object apply(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.RA:
+com.android.tools.r8.utils.TriPredicate -> com.android.tools.r8.internal.lB:
     boolean test(java.lang.Object,java.lang.Object,java.lang.Object) -> a
-com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.AC:
+com.android.tools.r8.utils.VersionProperties -> com.android.tools.r8.internal.cD:
     com.android.tools.r8.utils.VersionProperties INSTANCE -> a
     java.lang.String sha -> c
     boolean $assertionsDisabled -> b
@@ -79278,7 +79868,7 @@
     2:2:java.lang.String getSha():57:57 -> b
     1:1:boolean isEngineering():66:66 -> c
     1:1:java.lang.String toString():62:62 -> toString
-com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.OC:
+com.android.tools.r8.utils.Visibility -> com.android.tools.r8.internal.ED:
     com.android.tools.r8.utils.Visibility[] $VALUES -> e
     com.android.tools.r8.utils.Visibility PUBLIC -> a
     com.android.tools.r8.utils.Visibility PROTECTED -> b
@@ -79289,7 +79879,7 @@
     1:1:void <init>(java.lang.String,int):9:9 -> <init>
     1:1:com.android.tools.r8.utils.Visibility[] values():9:9 -> a
     1:15:java.lang.String toString():33:47 -> toString
-com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.eD:
+com.android.tools.r8.utils.WorkList -> com.android.tools.r8.internal.UD:
     java.util.Deque workingList -> b
     java.util.Set seen -> c
     boolean $assertionsDisabled -> a
@@ -79309,7 +79899,7 @@
     1:2:com.android.tools.r8.utils.WorkList newEqualityWorkList(java.lang.Iterable):24:25 -> d
     3:4:java.lang.Object next():92:93 -> d
     1:2:com.android.tools.r8.utils.WorkList newIdentityWorkList(java.lang.Iterable):40:41 -> e
-com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.internal.eD$a:
+com.android.tools.r8.utils.WorkList$EqualityTest -> com.android.tools.r8.internal.UD$a:
     com.android.tools.r8.utils.WorkList$EqualityTest IDENTITY -> b
     com.android.tools.r8.utils.WorkList$EqualityTest HASH -> a
     1:2:void <clinit>():101:102 -> <clinit>
@@ -79345,6 +79935,17 @@
     1:2:boolean isDexFile(java.lang.String):166:167 -> b
 com.android.tools.r8.utils.ZipUtils$OnEntryHandler -> com.android.tools.r8.utils.q$a:
     void onEntry(java.util.zip.ZipEntry,java.io.InputStream) -> a
+com.android.tools.r8.utils.ZipUtils$ZipBuilder -> com.android.tools.r8.utils.q$b:
+    java.util.zip.ZipOutputStream stream -> b
+    java.nio.file.Path zipFile -> a
+    1:3:void <init>(java.nio.file.Path):185:187 -> <init>
+    1:1:com.android.tools.r8.utils.ZipUtils$ZipBuilder builder(java.nio.file.Path):191:191 -> a
+    2:7:com.android.tools.r8.utils.ZipUtils$ZipBuilder addFilesRelative(java.nio.file.Path,java.util.Collection):196:201 -> a
+    8:8:com.android.tools.r8.utils.ZipUtils$ZipBuilder addFilesRelative(java.nio.file.Path,java.util.Collection):200:200 -> a
+    9:17:com.android.tools.r8.utils.ZipUtils$ZipBuilder addFilesRelative(java.nio.file.Path,java.util.Collection):199:207 -> a
+    18:18:com.android.tools.r8.utils.ZipUtils$ZipBuilder addFilesRelative(java.nio.file.Path,java.nio.file.Path[]):213:213 -> a
+    19:22:com.android.tools.r8.utils.ZipUtils$ZipBuilder addBytes(java.lang.String,byte[]):217:220 -> a
+    23:24:java.nio.file.Path build():225:226 -> a
 com.android.tools.r8.utils.collections.BidirectionalManyToOneMap -> com.android.tools.r8.internal.h2:
     java.util.Map backing -> a
     java.util.Map inverse -> b
@@ -79362,7 +79963,35 @@
     1:1:java.util.Set keySet():33:33 -> c
     2:2:boolean hasValue(java.lang.Object):41:41 -> c
     1:1:java.util.Set lambda$put$1(java.lang.Object):70:70 -> d
-com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Fc:
+com.android.tools.r8.utils.collections.DexMethodSignatureSet -> com.android.tools.r8.internal.Q8:
+    java.util.Set backing -> a
+    1:2:void <init>(java.util.Set):21:22 -> <init>
+    1:1:com.android.tools.r8.utils.collections.DexMethodSignatureSet createLinked():34:34 -> a
+    2:2:boolean add(com.android.tools.r8.graph.DexMethodSignature):38:38 -> a
+    3:3:boolean add(com.android.tools.r8.graph.DexEncodedMethod):46:46 -> a
+    4:4:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethod):42:42 -> a
+    4:4:boolean add(com.android.tools.r8.graph.DexEncodedMethod):46 -> a
+    5:5:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethodSignature):38:38 -> a
+    5:5:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.add(com.android.tools.r8.graph.DexMethod):42 -> a
+    5:5:boolean add(com.android.tools.r8.graph.DexEncodedMethod):46 -> a
+    6:6:void addAll(java.lang.Iterable):54:54 -> a
+    7:7:void addAll(com.android.tools.r8.utils.collections.DexMethodSignatureSet):62:62 -> a
+    8:9:void addAll(java.lang.Iterable,java.util.function.Function):66:67 -> a
+    1:386:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():0:385 -> b
+    1:386:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85 -> b
+    387:387:void com.android.tools.r8.graph.DexMethodSignature.<init>(com.android.tools.r8.graph.DexMethod):14:14 -> b
+    387:387:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexEncodedMethod.getSignature():385 -> b
+    387:387:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85 -> b
+    388:388:boolean com.android.tools.r8.utils.collections.DexMethodSignatureSet.remove(com.android.tools.r8.graph.DexMethodSignature):81:81 -> b
+    388:388:boolean remove(com.android.tools.r8.graph.DexEncodedMethod):85 -> b
+    389:389:com.android.tools.r8.utils.collections.DexMethodSignatureSet create(com.android.tools.r8.utils.collections.DexMethodSignatureSet):30:30 -> b
+    390:390:void addAllMethods(java.lang.Iterable):58:58 -> b
+    391:391:boolean contains(com.android.tools.r8.graph.DexMethodSignature):72:72 -> b
+    1:1:boolean remove(com.android.tools.r8.graph.DexMethodSignature):81:81 -> c
+    2:2:void removeAll(java.lang.Iterable):89:89 -> c
+    1:1:void removeAllMethods(java.lang.Iterable):93:93 -> d
+    1:1:java.util.Iterator iterator():77:77 -> iterator
+com.android.tools.r8.utils.collections.ImmutableDeque -> com.android.tools.r8.internal.Rc:
     boolean isClosed -> a
     1:1:void <init>(java.util.Collection):20:20 -> <init>
     2:2:void <init>(java.util.Collection):17:17 -> <init>
@@ -79386,7 +80015,7 @@
     1:1:boolean removeIf(java.util.function.Predicate):73:73 -> removeIf
     1:1:java.lang.Object removeLast():83:83 -> removeLast
     1:1:boolean removeLastOccurrence(java.lang.Object):78:78 -> removeLastOccurrence
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.Lc:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap -> com.android.tools.r8.internal.Xc:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> b
     1:1:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap,com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1):17:17 -> <init>
     2:3:void <init>(com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap):21:22 -> <init>
@@ -79401,6 +80030,7 @@
     3:3:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap tailMap(int):108:108 -> b
     4:4:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(java.lang.Integer):129:129 -> b
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap headMap(int):102:102 -> c
+    2:2:int firstIntKey():118:118 -> c
     1:1:java.lang.Object compute(java.lang.Object,java.util.function.BiFunction):17:17 -> compute
     2:2:java.lang.Object com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.compute(java.lang.Integer,java.util.function.BiFunction):179:179 -> compute
     2:2:java.lang.Object compute(java.lang.Object,java.util.function.BiFunction):17 -> compute
@@ -79410,25 +80040,24 @@
     1:1:java.lang.Object computeIfPresent(java.lang.Object,java.util.function.BiFunction):17:17 -> computeIfPresent
     2:2:java.lang.Object com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.computeIfPresent(java.lang.Integer,java.util.function.BiFunction):190:190 -> computeIfPresent
     2:2:java.lang.Object computeIfPresent(java.lang.Object,java.util.function.BiFunction):17 -> computeIfPresent
-    1:1:int firstIntKey():118:118 -> d
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet entrySet():85:85 -> entrySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.entrySet():85:85 -> entrySet
     2:2:java.util.Set entrySet():17 -> entrySet
     1:1:java.lang.Integer firstKey():147:147 -> firstKey
     2:2:java.lang.Integer com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.firstKey():147:147 -> firstKey
     2:2:java.lang.Object firstKey():17 -> firstKey
+    1:1:int lastIntKey():123:123 -> g
     1:1:java.lang.Object get(int):57:57 -> get
     2:2:java.lang.Object get(java.lang.Object):62:62 -> get
     1:1:java.lang.Object getOrDefault(java.lang.Object,java.lang.Object):67:67 -> getOrDefault
-    1:1:int lastIntKey():123:123 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.entrySet():85:85 -> h
+    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> h
     1:1:java.util.SortedMap headMap(java.lang.Object):17:17 -> headMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.headMap(java.lang.Integer):129:129 -> headMap
     2:2:java.util.SortedMap headMap(java.lang.Object):17 -> headMap
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.entrySet():85:85 -> i
-    1:1:com.android.tools.r8.it.unimi.dsi.fastutil.objects.ObjectSet entrySet():17 -> i
+    1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder builder():38:38 -> i
     1:1:boolean isEmpty():113:113 -> isEmpty
-    1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder builder():38:38 -> j
-    1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap empty():34:34 -> k
+    1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap empty():34:34 -> j
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.keySet():90:90 -> keySet
     1:1:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSet keySet():17 -> keySet
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.IntSortedSet keySet():90:90 -> keySet
@@ -79452,13 +80081,13 @@
     1:1:java.util.SortedMap tailMap(java.lang.Object):17:17 -> tailMap
     2:2:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap.tailMap(java.lang.Integer):135:135 -> tailMap
     2:2:java.util.SortedMap tailMap(java.lang.Object):17 -> tailMap
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.Jc:
-com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Kc:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$1 -> com.android.tools.r8.internal.Vc:
+com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder -> com.android.tools.r8.internal.Wc:
     com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2ReferenceSortedMap sortedMap -> a
     1:3:void <init>():41:43 -> <init>
     1:1:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap$Builder put(int,java.lang.Object):46:46 -> a
     2:2:com.android.tools.r8.utils.collections.ImmutableInt2ReferenceSortedMap build():51:51 -> a
-com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.kn:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodMultisetBuilder -> com.android.tools.r8.internal.wn:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:1:void <init>():19:19 -> <init>
     2:2:void <init>():17:17 -> <init>
@@ -79472,7 +80101,7 @@
     7:7:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38 -> a
     8:9:void lambda$build$0(com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.collections.ProgramMethodMultiset,com.android.tools.r8.graph.DexMethod,int):38:39 -> a
     1:1:int size():30:30 -> b
-com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.ln:
+com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder -> com.android.tools.r8.internal.xn:
     java.util.Set methods -> b
     java.util.function.IntFunction factory -> a
     1:3:void <init>(java.util.function.IntFunction,java.util.Set):22:24 -> <init>
@@ -79488,7 +80117,7 @@
     4:9:void rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens):51:56 -> b
     1:2:com.android.tools.r8.utils.collections.LongLivedProgramMethodSetBuilder createForSortedSet():33:34 -> c
     1:1:boolean isEmpty():74:74 -> d
-com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.gt:
+com.android.tools.r8.utils.collections.ProgramFieldSet -> com.android.tools.r8.internal.Bt:
     java.util.Map backing -> b
     boolean $assertionsDisabled -> a
     1:3:void <clinit>():19:21 -> <clinit>
@@ -79499,7 +80128,7 @@
     4:4:boolean add(com.android.tools.r8.graph.ProgramField):39 -> a
     5:5:boolean add(com.android.tools.r8.graph.ProgramField):39:39 -> a
     1:1:java.util.Iterator iterator():73:73 -> iterator
-com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.jt:
+com.android.tools.r8.utils.collections.ProgramMethodMultiset -> com.android.tools.r8.internal.Et:
     com.android.tools.r8.com.google.common.collect.Multiset backing -> a
     1:2:void <init>(com.android.tools.r8.com.google.common.collect.Multiset):20:21 -> <init>
     1:1:com.android.tools.r8.utils.collections.ProgramMethodMultiset createHash():25:25 -> a
@@ -79509,7 +80138,7 @@
     4:4:void createAndAdd(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexEncodedMethod,int):29:29 -> a
     5:5:void forEachEntry(java.util.function.ObjIntConsumer):33:33 -> a
     6:6:void lambda$forEachEntry$0(java.util.function.ObjIntConsumer,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,int):33:33 -> a
-com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.kt:
+com.android.tools.r8.utils.collections.ProgramMethodSet -> com.android.tools.r8.internal.Ft:
     java.util.function.Supplier backingFactory -> d
     java.util.Map backing -> c
     com.android.tools.r8.utils.collections.ProgramMethodSet EMPTY -> a
@@ -79540,15 +80169,21 @@
     1:1:java.util.Iterator iterator():104:104 -> iterator
     1:1:int size():129:129 -> size
     1:1:java.util.stream.Stream stream():133:133 -> stream
-com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.ry:
-    1:1:void <init>(java.util.function.Supplier):23:23 -> <init>
-    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):20:20 -> a
-    2:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet create(com.android.tools.r8.utils.ForEachable):37:39 -> a
-    5:5:void lambda$rewrittenWithLens$1(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):47:47 -> a
-    6:6:void lambda$rewrittenWithLens$2(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):47:47 -> a
-    7:7:int lambda$toDefinitionSet$3(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):53:53 -> a
-    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):46:46 -> b
-    2:2:void lambda$toDefinitionSet$4(java.util.Set,com.android.tools.r8.graph.ProgramMethod):55:55 -> b
-    1:4:java.util.Set toDefinitionSet():52:55 -> e
-    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():27:27 -> h
-    1:1:java.util.TreeMap lambda$create$0():38:38 -> i
+com.android.tools.r8.utils.collections.SortedProgramMethodSet -> com.android.tools.r8.internal.Ky:
+    com.android.tools.r8.utils.collections.SortedProgramMethodSet EMPTY -> e
+    1:1:void <clinit>():25:25 -> <clinit>
+    1:1:void <init>(java.util.function.Supplier):29:29 -> <init>
+    1:1:com.android.tools.r8.utils.collections.ProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):23:23 -> a
+    2:4:com.android.tools.r8.utils.collections.SortedProgramMethodSet create(com.android.tools.r8.utils.ForEachable):43:45 -> a
+    5:5:void lambda$rewrittenWithLens$3(java.util.function.Consumer,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.ProgramMethod):61:61 -> a
+    6:6:void lambda$rewrittenWithLens$4(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.DexDefinitionSupplier,java.util.function.Consumer):61:61 -> a
+    7:7:int lambda$toDefinitionSet$5(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.DexEncodedMethod):67:67 -> a
+    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet rewrittenWithLens(com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.graph.GraphLens):60:60 -> b
+    2:2:void lambda$toDefinitionSet$6(java.util.Set,com.android.tools.r8.graph.ProgramMethod):69:69 -> b
+    1:4:java.util.Set toDefinitionSet():66:69 -> e
+    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet create():33:33 -> h
+    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet createConcurrent():50:50 -> i
+    1:1:com.android.tools.r8.utils.collections.SortedProgramMethodSet empty():54:54 -> j
+    1:1:java.util.SortedMap lambda$create$1():44:44 -> k
+    1:1:java.util.SortedMap lambda$createConcurrent$2():50:50 -> l
+    1:1:java.util.SortedMap lambda$static$0():26:26 -> m